diff options
author | WonYoung Choi <wy80.choi@samsung.com> | 2017-03-06 15:41:54 +0900 |
---|---|---|
committer | WonYoung Choi <wy80.choi@samsung.com> | 2017-03-06 15:41:54 +0900 |
commit | 7998bed665fded697228af3e2665edbc1f04c79e (patch) | |
tree | 29f5d29866ace75b5aba88b0e3d7f28ffac7c50b | |
parent | 55264ed05f2717cdc3f73ba07eb7a465c021714c (diff) | |
download | elm-sharp-7998bed665fded697228af3e2665edbc1f04c79e.tar.gz elm-sharp-7998bed665fded697228af3e2665edbc1f04c79e.tar.bz2 elm-sharp-7998bed665fded697228af3e2665edbc1f04c79e.zip |
Remove NET45 project and Clean up codesubmit/tizen_unified/20170310.011401submit/tizen_unified/20170308.100503submit/tizen/20170306.065826accepted/tizen/unified/20170310.075717accepted/tizen/unified/20170309.120723accepted/tizen/tv/20170309.071900accepted/tizen/mobile/20170309.071743accepted/tizen/ivi/20170309.071959accepted/tizen/common/20170309.174826
Change-Id: I7279e95988690dd859c76b07cd6aae9b85601898
42 files changed, 61 insertions, 286 deletions
diff --git a/ElmSharp.Test/ElmSharp.Test.project.json b/ElmSharp.Test/ElmSharp.Test.project.json index e6aacc0..fb635aa 100644 --- a/ElmSharp.Test/ElmSharp.Test.project.json +++ b/ElmSharp.Test/ElmSharp.Test.project.json @@ -1,7 +1,7 @@ { "dependencies": { "Microsoft.NETCore.App": "1.0.0", - "Tizen.Applications": "1.0.1" + "Tizen.Applications": "1.1.0" }, "frameworks": { "netcoreapp1.0": {} diff --git a/ElmSharp.Test/TC/ScreenInformationTest.cs b/ElmSharp.Test/TC/ScreenInformationTest.cs index 92a5d4a..5150454 100644 --- a/ElmSharp.Test/TC/ScreenInformationTest.cs +++ b/ElmSharp.Test/TC/ScreenInformationTest.cs @@ -14,9 +14,6 @@ * limitations under the License. */ -using System; -using System.Linq; - namespace ElmSharp.Test { public class ScreenInformationTest : TestCaseBase @@ -24,9 +21,6 @@ namespace ElmSharp.Test public override string TestName => "ScreenInformationTest"; public override string TestDescription => "To get screen information"; - Naviframe _navi; - int _sequence = 0; - public override void Run(Window window) { Conformant conformant = new Conformant(window); @@ -46,66 +40,6 @@ namespace ElmSharp.Test label2.Text = string.Format("<span color=#FFFFFF , font_size=50>ScreenDPI : xdpi : {0} ydpi : {1}", window.ScreenDpi.X, window.ScreenDpi.Y); label2.Show(); box.PackEnd(label2); - } - - EvasObject CreatePage(Window parent) - { - Box box = new Box(parent); - box.Show(); - - Label label = new Label(parent) - { - Text = string.Format("{0} Page", _sequence++), - WeightX = 1, - AlignmentX = -1, - }; - Button push = new Button(parent) - { - Text = "Push", - WeightX = 1, - AlignmentX = -1, - }; - Button pop = new Button(parent) - { - Text = "pop", - WeightX = 1, - AlignmentX = -1, - }; - - label.Show(); - push.Show(); - pop.Show(); - - push.Clicked += (s, e) => - { - _navi.Push(CreatePage(parent), string.Format("{0} Page", _sequence - 1)); - }; - - pop.Clicked += (s, e) => - { - var item = _navi.NavigationStack.LastOrDefault(); - int nativePointer = (int)(IntPtr)(item.Content); - Console.WriteLine("----- Before Call _navi.Pop() {0:x} ", nativePointer); - _navi.Pop(); - Console.WriteLine("----- After Call _navi.Pop() {0:x} ", nativePointer); - }; - - push.Resize(500, 100); - pop.Resize(500, 100); - label.Resize(500, 100); - box.SetLayoutCallback(() => - { - Console.WriteLine("Layout callback with : {0}", box.Geometry); - var rect = box.Geometry; - label.Move(rect.X, rect.Y); - push.Move(rect.X, rect.Y + 100); - pop.Move(rect.X, rect.Y + 200); - }); - - box.PackEnd(label); - box.PackEnd(push); - box.PackEnd(pop); - return box; - } + } } } diff --git a/ElmSharp/ElmSharp.Net45.csproj b/ElmSharp/ElmSharp.Net45.csproj deleted file mode 100755 index d210cf3..0000000 --- a/ElmSharp/ElmSharp.Net45.csproj +++ /dev/null @@ -1,172 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProjectGuid>{657E0754-FAF0-42B9-B9F5-45868826758E}</ProjectGuid> - <OutputType>Library</OutputType> - <AppDesignerFolder>Properties</AppDesignerFolder> - <RootNamespace>ElmSharp</RootNamespace> - <AssemblyName>ElmSharp</AssemblyName> - <FileAlignment>512</FileAlignment> - <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> - <DebugSymbols>true</DebugSymbols> - <DebugType>full</DebugType> - <Optimize>true</Optimize> - <OutputPath>bin\Debug\Net45\</OutputPath> - <DefineConstants>DEBUG;TRACE</DefineConstants> - <ErrorReport>prompt</ErrorReport> - <WarningLevel>4</WarningLevel> - <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> - <DebugType>pdbonly</DebugType> - <Optimize>true</Optimize> - <OutputPath>bin\Release\Net45\</OutputPath> - <DefineConstants>TRACE</DefineConstants> - <ErrorReport>prompt</ErrorReport> - <WarningLevel>4</WarningLevel> - <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - </PropertyGroup> - <PropertyGroup> - <SignAssembly>true</SignAssembly> - </PropertyGroup> - <PropertyGroup> - <AssemblyOriginatorKeyFile>ElmSharp.snk</AssemblyOriginatorKeyFile> - </PropertyGroup> - <ItemGroup> - <Reference Include="System" /> - <Reference Include="System.Core" /> - <Reference Include="System.Xml.Linq" /> - <Reference Include="System.Data.DataSetExtensions" /> - <Reference Include="Microsoft.CSharp" /> - <Reference Include="System.Data" /> - <Reference Include="System.Net.Http" /> - <Reference Include="System.Xml" /> - </ItemGroup> - <ItemGroup> - <Compile Include="ElmSharp\Background.cs" /> - <Compile Include="ElmSharp\Box.cs" /> - <Compile Include="ElmSharp\Button.cs" /> - <Compile Include="ElmSharp\Calendar.cs" /> - <Compile Include="ElmSharp\Check.cs" /> - <Compile Include="ElmSharp\CheckStateChangedEventArgs.cs" /> - <Compile Include="ElmSharp\Color.cs" /> - <Compile Include="ElmSharp\ColorChangedEventArgs.cs" /> - <Compile Include="ElmSharp\ColorSelector.cs" /> - <Compile Include="ElmSharp\Conformant.cs" /> - <Compile Include="ElmSharp\Container.cs" /> - <Compile Include="ElmSharp\ContextPopup.cs" /> - <Compile Include="ElmSharp\ColorSelectorItem.cs" /> - <Compile Include="ElmSharp\ContextPopupItem.cs" /> - <Compile Include="ElmSharp\DateChangedEventArgs.cs" /> - <Compile Include="ElmSharp\DateTimeSelector.cs" /> - <Compile Include="ElmSharp\DisplayedMonthChangedEventArgs.cs" /> - <Compile Include="ElmSharp\EcoreAnimator.cs" /> - <Compile Include="ElmSharp\EcoreMainloop.cs" /> - <Compile Include="ElmSharp\EcoreSynchronizationContext.cs" /> - <Compile Include="ElmSharp\EdjeObject.cs" /> - <Compile Include="ElmSharp\ElmScrollConfig.cs" /> - <Compile Include="ElmSharp\Elementary.cs" /> - <Compile Include="ElmSharp\Entry.cs" /> - <Compile Include="ElmSharp\EvasKeyEventArgs.cs" /> - <Compile Include="ElmSharp\EvasMap.cs" /> - <Compile Include="ElmSharp\EvasObject.cs" /> - <Compile Include="ElmSharp\EvasObjectEvent.cs" /> - <Compile Include="ElmSharp\FlipSelector.cs" /> - <Compile Include="ElmSharp\FlipSelectorItem.cs" /> - <Compile Include="ElmSharp\FloatingButton.cs" /> - <Compile Include="ElmSharp\GenGrid.cs" /> - <Compile Include="ElmSharp\GenGridItem.cs" /> - <Compile Include="ElmSharp\GenItem.cs" /> - <Compile Include="ElmSharp\GenItemClass.cs" /> - <Compile Include="ElmSharp\GenList.cs" /> - <Compile Include="ElmSharp\GenListItem.cs" /> - <Compile Include="ElmSharp\GestureLayer.cs" /> - <Compile Include="ElmSharp\Icon.cs" /> - <Compile Include="ElmSharp\Image.cs" /> - <Compile Include="ElmSharp\Index.cs" /> - <Compile Include="ElmSharp\IndexItem.cs" /> - <Compile Include="ElmSharp\ItemObject.cs" /> - <Compile Include="ElmSharp\Label.cs" /> - <Compile Include="ElmSharp\Layout.cs" /> - <Compile Include="ElmSharp\List.cs" /> - <Compile Include="ElmSharp\ListItem.cs" /> - <Compile Include="ElmSharp\Naviframe.cs" /> - <Compile Include="ElmSharp\NaviItem.cs" /> - <Compile Include="ElmSharp\Panel.cs" /> - <Compile Include="ElmSharp\Panes.cs" /> - <Compile Include="ElmSharp\Point.cs" /> - <Compile Include="ElmSharp\Point3D.cs" /> - <Compile Include="ElmSharp\Polygon.cs" /> - <Compile Include="ElmSharp\Popup.cs" /> - <Compile Include="ElmSharp\PopupItem.cs" /> - <Compile Include="ElmSharp\ProgressBar.cs" /> - <Compile Include="ElmSharp\Radio.cs" /> - <Compile Include="ElmSharp\Rect.cs" /> - <Compile Include="ElmSharp\Rectangle.cs" /> - <Compile Include="ElmSharp\Scroller.cs" /> - <Compile Include="ElmSharp\Size.cs" /> - <Compile Include="ElmSharp\Slider.cs" /> - <Compile Include="ElmSharp\SmartEvent.cs" /> - <Compile Include="ElmSharp\Spinner.cs" /> - <Compile Include="ElmSharp\Table.cs" /> - <Compile Include="ElmSharp\Toolbar.cs" /> - <Compile Include="ElmSharp\ToolbarItem.cs" /> - <Compile Include="ElmSharp\Widget.cs" /> - <Compile Include="ElmSharp\Window.cs" /> - <Compile Include="ElmSharp\WrapType.cs" /> - <Compile Include="Interop\Interop.Eina.cs" /> - <Compile Include="Interop\Interop.Elementary.FlipSelector.cs" /> - <Compile Include="Interop\Interop.Eo.cs" /> - <Compile Include="Interop\Interop.Ecore.cs" /> - <Compile Include="Interop\Interop.Elementary.Bg.cs" /> - <Compile Include="Interop\Interop.Elementary.Box.cs" /> - <Compile Include="Interop\Interop.Elementary.Button.cs" /> - <Compile Include="Interop\Interop.Elementary.CalendarView.cs" /> - <Compile Include="Interop\Interop.Elementary.ColorPicker.cs" /> - <Compile Include="Interop\Interop.Elementary.cs" /> - <Compile Include="Interop\Interop.Elementary.CtxPopup.cs" /> - <Compile Include="Interop\Interop.Elementary.DateTimePicker.cs" /> - <Compile Include="Interop\Interop.Elementary.Entry.cs" /> - <Compile Include="Interop\Interop.Elementary.FloatingButton.cs" /> - <Compile Include="Interop\Interop.Elementary.GenGridView.cs" /> - <Compile Include="Interop\Interop.Elementary.GenListView.cs" /> - <Compile Include="Interop\Interop.Elementary.GestureLayer.cs" /> - <Compile Include="Interop\Interop.Elementary.Image.cs" /> - <Compile Include="Interop\Interop.Elementary.Index.cs" /> - <Compile Include="Interop\Interop.Elementary.Label.cs" /> - <Compile Include="Interop\Interop.Elementary.List.cs" /> - <Compile Include="Interop\Interop.Elementary.Naviframe.cs" /> - <Compile Include="Interop\Interop.Elementary.Panel.cs" /> - <Compile Include="Interop\Interop.Elementary.Panes.cs" /> - <Compile Include="Interop\Interop.Elementary.Popup.cs" /> - <Compile Include="Interop\Interop.Elementary.ProgressBar.cs" /> - <Compile Include="Interop\Interop.Elementary.ScrollView.cs" /> - <Compile Include="Interop\Interop.Elementary.Slider.cs" /> - <Compile Include="Interop\Interop.Elementary.Spinner.cs" /> - <Compile Include="Interop\Interop.Elementary.Table.cs" /> - <Compile Include="Interop\Interop.Elementary.Toolbar.cs" /> - <Compile Include="Interop\Interop.Elementary.Win.cs" /> - <Compile Include="Interop\Interop.Evas.cs" /> - <Compile Include="Interop\Interop.Evas.Image.cs" /> - <Compile Include="Interop\Interop.Libc.cs" /> - <Compile Include="Interop\Interop.Libraries.cs" /> - <Compile Include="Properties\AssemblyInfo.cs" /> - </ItemGroup> - <ItemGroup> - <None Include="ElmSharp.Net45.project.json" /> - <None Include="ElmSharp.nuspec" /> - <None Include="ElmSharp.snk" /> - </ItemGroup> - <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> - <!-- To modify your build process, add your task inside one of the targets below and uncomment it. - Other similar extension points exist, see Microsoft.Common.targets. - <Target Name="BeforeBuild"> - </Target> - <Target Name="AfterBuild"> - </Target> - --> -</Project>
\ No newline at end of file diff --git a/ElmSharp/ElmSharp.Net45.project.json b/ElmSharp/ElmSharp.Net45.project.json deleted file mode 100644 index 5e1948a..0000000 --- a/ElmSharp/ElmSharp.Net45.project.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "frameworks": { - "net45": {} - }, - "runtimes": { - "win": {} - } -} diff --git a/ElmSharp/ElmSharp.nuspec b/ElmSharp/ElmSharp.nuspec index 3a0a615..789e195 100644 --- a/ElmSharp/ElmSharp.nuspec +++ b/ElmSharp/ElmSharp.nuspec @@ -13,6 +13,5 @@ </metadata> <files> <file src="bin/$Configuration$/ElmSharp.dll" target="lib/netstandard1.3" /> - <file src="bin/$Configuration$/Net45/ElmSharp.dll" target="lib/net45" /> </files> </package> diff --git a/ElmSharp/ElmSharp/Background.cs b/ElmSharp/ElmSharp/Background.cs index 5d6b023..bb25d3b 100755..100644 --- a/ElmSharp/ElmSharp/Background.cs +++ b/ElmSharp/ElmSharp/Background.cs @@ -43,7 +43,7 @@ namespace ElmSharp set { var swallowContent = GetPartContent("elm.swallow.rectangle"); - if(swallowContent == IntPtr.Zero) + if (swallowContent == IntPtr.Zero) { Interop.Elementary.elm_bg_color_set(RealHandle, value.R, value.G, value.B); swallowContent = GetPartContent("elm.swallow.rectangle"); @@ -68,11 +68,11 @@ namespace ElmSharp { get { - return (BackgroundOptions) Interop.Elementary.elm_bg_option_get(RealHandle); + return (BackgroundOptions)Interop.Elementary.elm_bg_option_get(RealHandle); } set { - Interop.Elementary.elm_bg_option_set(RealHandle, (Interop.Elementary.BackgroundOptions) value); + Interop.Elementary.elm_bg_option_set(RealHandle, (Interop.Elementary.BackgroundOptions)value); } } diff --git a/ElmSharp/ElmSharp/Button.cs b/ElmSharp/ElmSharp/Button.cs index 302bdf9..302bdf9 100755..100644 --- a/ElmSharp/ElmSharp/Button.cs +++ b/ElmSharp/ElmSharp/Button.cs diff --git a/ElmSharp/ElmSharp/Calendar.cs b/ElmSharp/ElmSharp/Calendar.cs index 75cfef0..75cfef0 100755..100644 --- a/ElmSharp/ElmSharp/Calendar.cs +++ b/ElmSharp/ElmSharp/Calendar.cs diff --git a/ElmSharp/ElmSharp/Check.cs b/ElmSharp/ElmSharp/Check.cs index c4419fd..c4419fd 100755..100644 --- a/ElmSharp/ElmSharp/Check.cs +++ b/ElmSharp/ElmSharp/Check.cs diff --git a/ElmSharp/ElmSharp/Color.cs b/ElmSharp/ElmSharp/Color.cs index f1730a3..7b3ef17 100644 --- a/ElmSharp/ElmSharp/Color.cs +++ b/ElmSharp/ElmSharp/Color.cs @@ -68,7 +68,7 @@ namespace ElmSharp { } - public Color(int r, int g, int b, int a) : this(r,g,b,a, Mode.Rgb) + public Color(int r, int g, int b, int a) : this(r, g, b, a, Mode.Rgb) { } @@ -106,10 +106,26 @@ namespace ElmSharp return base.Equals(obj); } + public static bool operator ==(Color a, Color b) + { + if (ReferenceEquals(a, b)) + return true; + + if ((object)a == null || (object)b == null) + return false; + + return EqualsInner(a, b); + } + + public static bool operator !=(Color a, Color b) + { + return !(a == b); + } + static bool EqualsInner(Color color1, Color color2) { if (color1._mode == Mode.Default && color2._mode == Mode.Default) - return true; + return true; return color1._r == color2._r && color1._g == color2._g && color1._b == color2._b && color1._a == color2._a; } diff --git a/ElmSharp/ElmSharp/ColorSelector.cs b/ElmSharp/ElmSharp/ColorSelector.cs index 137aa41..6036ea9 100755..100644 --- a/ElmSharp/ElmSharp/ColorSelector.cs +++ b/ElmSharp/ElmSharp/ColorSelector.cs @@ -81,7 +81,7 @@ namespace ElmSharp { get { - return (ColorSelectorMode) Interop.Elementary.elm_colorselector_mode_get(Handle); + return (ColorSelectorMode)Interop.Elementary.elm_colorselector_mode_get(Handle); } set { diff --git a/ElmSharp/ElmSharp/ColorSelectorItem.cs b/ElmSharp/ElmSharp/ColorSelectorItem.cs index 4ee5f7a..4ee5f7a 100755..100644 --- a/ElmSharp/ElmSharp/ColorSelectorItem.cs +++ b/ElmSharp/ElmSharp/ColorSelectorItem.cs diff --git a/ElmSharp/ElmSharp/Container.cs b/ElmSharp/ElmSharp/Container.cs index 2842629..b9c4b08 100644 --- a/ElmSharp/ElmSharp/Container.cs +++ b/ElmSharp/ElmSharp/Container.cs @@ -27,11 +27,11 @@ namespace ElmSharp { } - public override Color BackgroundColor + public override Color BackgroundColor { set { - if(value.IsDefault) + if (value.IsDefault) { SetPartColor("bg", Color.Transparent); } diff --git a/ElmSharp/ElmSharp/ContextPopup.cs b/ElmSharp/ElmSharp/ContextPopup.cs index e812c8c..e812c8c 100755..100644 --- a/ElmSharp/ElmSharp/ContextPopup.cs +++ b/ElmSharp/ElmSharp/ContextPopup.cs diff --git a/ElmSharp/ElmSharp/DateTimeSelector.cs b/ElmSharp/ElmSharp/DateTimeSelector.cs index 5aff93a..5aff93a 100755..100644 --- a/ElmSharp/ElmSharp/DateTimeSelector.cs +++ b/ElmSharp/ElmSharp/DateTimeSelector.cs diff --git a/ElmSharp/ElmSharp/EcoreAnimator.cs b/ElmSharp/ElmSharp/EcoreAnimator.cs index 05ab8ed..200155f 100644 --- a/ElmSharp/ElmSharp/EcoreAnimator.cs +++ b/ElmSharp/ElmSharp/EcoreAnimator.cs @@ -65,7 +65,7 @@ namespace ElmSharp int task_id = (int)userData; Func<bool> userAction = null; _taskMap.TryGetValue(task_id, out userAction); - return (userAction != null)?userAction():false; + return (userAction != null) ? userAction() : false; } } diff --git a/ElmSharp/ElmSharp/EdjeObject.cs b/ElmSharp/ElmSharp/EdjeObject.cs index 4dc7e28..db302c7 100755..100644 --- a/ElmSharp/ElmSharp/EdjeObject.cs +++ b/ElmSharp/ElmSharp/EdjeObject.cs @@ -63,7 +63,8 @@ namespace ElmSharp public string Name { get { return _part; } } - public string Text { + public string Text + { get { return Interop.Elementary.edje_object_part_text_get(_edjeHandle, _part); diff --git a/ElmSharp/ElmSharp/EvasKeyEventArgs.cs b/ElmSharp/ElmSharp/EvasKeyEventArgs.cs index 11964a3..1ecc70b 100644 --- a/ElmSharp/ElmSharp/EvasKeyEventArgs.cs +++ b/ElmSharp/ElmSharp/EvasKeyEventArgs.cs @@ -29,11 +29,11 @@ namespace ElmSharp static public EvasKeyEventArgs Create(IntPtr data, IntPtr obj, IntPtr info) { - EvasEventKeyDown evt = (EvasEventKeyDown)Marshal.PtrToStructure(info, typeof(EvasEventKeyDown)); + var evt = Marshal.PtrToStructure<EvasEventKeyDown>(info); return new EvasKeyEventArgs() { KeyName = evt.keyname }; } - [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + [StructLayout(LayoutKind.Sequential)] struct EvasEventKeyDown { public string keyname; diff --git a/ElmSharp/ElmSharp/EvasObject.cs b/ElmSharp/ElmSharp/EvasObject.cs index d756b97..732370b 100644 --- a/ElmSharp/ElmSharp/EvasObject.cs +++ b/ElmSharp/ElmSharp/EvasObject.cs @@ -353,7 +353,7 @@ namespace ElmSharp public void Realize(EvasObject parent) { - if(!IsRealized) + if (!IsRealized) { Parent = parent; Handle = CreateHandle(parent); diff --git a/ElmSharp/ElmSharp/FloatingButton.cs b/ElmSharp/ElmSharp/FloatingButton.cs index 368eef3..368eef3 100755..100644 --- a/ElmSharp/ElmSharp/FloatingButton.cs +++ b/ElmSharp/ElmSharp/FloatingButton.cs diff --git a/ElmSharp/ElmSharp/GenGrid.cs b/ElmSharp/ElmSharp/GenGrid.cs index fe7b2d0..fe7b2d0 100755..100644 --- a/ElmSharp/ElmSharp/GenGrid.cs +++ b/ElmSharp/ElmSharp/GenGrid.cs diff --git a/ElmSharp/ElmSharp/GenList.cs b/ElmSharp/ElmSharp/GenList.cs index eba52f5..eba52f5 100755..100644 --- a/ElmSharp/ElmSharp/GenList.cs +++ b/ElmSharp/ElmSharp/GenList.cs diff --git a/ElmSharp/ElmSharp/GestureLayer.cs b/ElmSharp/ElmSharp/GestureLayer.cs index 3e0bfd1..e673e59 100644 --- a/ElmSharp/ElmSharp/GestureLayer.cs +++ b/ElmSharp/ElmSharp/GestureLayer.cs @@ -368,20 +368,20 @@ namespace ElmSharp case GestureType.LongTap: case GestureType.DoubleTap: case GestureType.TripleTap: - action(Marshal.PtrToStructure(event_info, typeof(TapData))); + action(Marshal.PtrToStructure<TapData>(event_info)); break; case GestureType.Momentum: - action(Marshal.PtrToStructure(event_info, typeof(MomentumData))); + action(Marshal.PtrToStructure<MomentumData>(event_info)); break; case GestureType.Line: case GestureType.Flick: - action(Marshal.PtrToStructure(event_info, typeof(LineData))); + action(Marshal.PtrToStructure<LineData>(event_info)); break; case GestureType.Zoom: - action(Marshal.PtrToStructure(event_info, typeof(ZoomData))); + action(Marshal.PtrToStructure<ZoomData>(event_info)); break; case GestureType.Rotate: - action(Marshal.PtrToStructure(event_info, typeof(RotateData))); + action(Marshal.PtrToStructure<RotateData>(event_info)); break; } } @@ -401,7 +401,7 @@ namespace ElmSharp /// </summary> public Int32 Y; - #pragma warning disable 3003 +#pragma warning disable 3003 /// <summary> /// The number of fingers tapped. /// </summary> @@ -411,7 +411,7 @@ namespace ElmSharp /// The timestamp. /// </summary> public UInt32 Timestamp; - #pragma warning restore 3003 +#pragma warning restore 3003 } [StructLayout(LayoutKind.Sequential)] @@ -437,7 +437,7 @@ namespace ElmSharp /// </summary> public Int32 Y2; - #pragma warning disable 3003 +#pragma warning disable 3003 /// <summary> /// Timestamp of start of final x-swipe. /// </summary> @@ -462,7 +462,7 @@ namespace ElmSharp /// Number of fingers. /// </summary> public UInt32 FingersCount; - #pragma warning restore 3003 +#pragma warning restore 3003 } [StructLayout(LayoutKind.Sequential)] @@ -488,7 +488,7 @@ namespace ElmSharp /// </summary> public Int32 Y2; - #pragma warning disable 3003 +#pragma warning disable 3003 /// <summary> /// Timestamp of start of final x-swipe. /// </summary> @@ -513,7 +513,7 @@ namespace ElmSharp /// Number of fingers. /// </summary> public UInt32 FingersCount; - #pragma warning restore 3003 +#pragma warning restore 3003 /// <summary> /// Angle (direction) of lines. @@ -590,20 +590,24 @@ namespace ElmSharp { public static double DefaultLongTapTimeout { - get { + get + { return Interop.Elementary.elm_config_glayer_long_tap_start_timeout_get(); } - set { + set + { Interop.Elementary.elm_config_glayer_long_tap_start_timeout_set(value); } } public static double DefaultDoubleTapTimeout { - get { + get + { return Interop.Elementary.elm_config_glayer_double_tap_timeout_get(); } - set { + set + { Interop.Elementary.elm_config_glayer_double_tap_timeout_set(value); } } diff --git a/ElmSharp/ElmSharp/Icon.cs b/ElmSharp/ElmSharp/Icon.cs index 6960e87..6960e87 100755..100644 --- a/ElmSharp/ElmSharp/Icon.cs +++ b/ElmSharp/ElmSharp/Icon.cs diff --git a/ElmSharp/ElmSharp/Image.cs b/ElmSharp/ElmSharp/Image.cs index 2cb614e..2cb614e 100755..100644 --- a/ElmSharp/ElmSharp/Image.cs +++ b/ElmSharp/ElmSharp/Image.cs diff --git a/ElmSharp/ElmSharp/Index.cs b/ElmSharp/ElmSharp/Index.cs index 5f0e957..5f0e957 100755..100644 --- a/ElmSharp/ElmSharp/Index.cs +++ b/ElmSharp/ElmSharp/Index.cs diff --git a/ElmSharp/ElmSharp/Layout.cs b/ElmSharp/ElmSharp/Layout.cs index 4717adb..828334d 100644 --- a/ElmSharp/ElmSharp/Layout.cs +++ b/ElmSharp/ElmSharp/Layout.cs @@ -28,7 +28,8 @@ namespace ElmSharp public Layout(EvasObject parent) : base(parent) { _languageChanged = new SmartEvent(this, this.RealHandle, "language,changed"); - _languageChanged.On += (s, e) => { + _languageChanged.On += (s, e) => + { LanguageChanged?.Invoke(this, EventArgs.Empty); }; @@ -67,7 +68,7 @@ namespace ElmSharp { set { - if(value.IsDefault) + if (value.IsDefault) { string part = ClassName.ToLower().Replace("elm_", "") + "/" + "bg"; EdjeObject.DeleteColorClass(part); diff --git a/ElmSharp/ElmSharp/List.cs b/ElmSharp/ElmSharp/List.cs index 3201cca..3201cca 100755..100644 --- a/ElmSharp/ElmSharp/List.cs +++ b/ElmSharp/ElmSharp/List.cs diff --git a/ElmSharp/ElmSharp/Naviframe.cs b/ElmSharp/ElmSharp/Naviframe.cs index 8944eff..109d97e 100755..100644 --- a/ElmSharp/ElmSharp/Naviframe.cs +++ b/ElmSharp/ElmSharp/Naviframe.cs @@ -136,7 +136,7 @@ namespace ElmSharp { Interop.Elementary.elm_naviframe_item_pop(RealHandle); } - + protected override IntPtr CreateHandle(EvasObject parent) { IntPtr handle = Interop.Elementary.elm_layout_add(parent); diff --git a/ElmSharp/ElmSharp/Panel.cs b/ElmSharp/ElmSharp/Panel.cs index 9174250..c6aac69 100755..100644 --- a/ElmSharp/ElmSharp/Panel.cs +++ b/ElmSharp/ElmSharp/Panel.cs @@ -87,7 +87,7 @@ namespace ElmSharp { Interop.Elementary.elm_panel_toggle(RealHandle); } - + protected override IntPtr CreateHandle(EvasObject parent) { IntPtr handle = Interop.Elementary.elm_layout_add(parent); diff --git a/ElmSharp/ElmSharp/Panes.cs b/ElmSharp/ElmSharp/Panes.cs index 3a223ae..3a223ae 100755..100644 --- a/ElmSharp/ElmSharp/Panes.cs +++ b/ElmSharp/ElmSharp/Panes.cs diff --git a/ElmSharp/ElmSharp/Polygon.cs b/ElmSharp/ElmSharp/Polygon.cs index e9d9b95..e669a70 100644 --- a/ElmSharp/ElmSharp/Polygon.cs +++ b/ElmSharp/ElmSharp/Polygon.cs @@ -27,7 +27,7 @@ namespace ElmSharp /// Create a new Polygon widget. /// <param name="p">The EvasObject to which the new Polygon will be attached as a child.</param> /// </summary> - public Polygon (EvasObject parent) : base(parent) + public Polygon(EvasObject parent) : base(parent) { } diff --git a/ElmSharp/ElmSharp/Popup.cs b/ElmSharp/ElmSharp/Popup.cs index 6de02bc..6de02bc 100755..100644 --- a/ElmSharp/ElmSharp/Popup.cs +++ b/ElmSharp/ElmSharp/Popup.cs diff --git a/ElmSharp/ElmSharp/ProgressBar.cs b/ElmSharp/ElmSharp/ProgressBar.cs index 1e65072..1e65072 100755..100644 --- a/ElmSharp/ElmSharp/ProgressBar.cs +++ b/ElmSharp/ElmSharp/ProgressBar.cs diff --git a/ElmSharp/ElmSharp/Radio.cs b/ElmSharp/ElmSharp/Radio.cs index dec0c58..dec0c58 100755..100644 --- a/ElmSharp/ElmSharp/Radio.cs +++ b/ElmSharp/ElmSharp/Radio.cs diff --git a/ElmSharp/ElmSharp/Scroller.cs b/ElmSharp/ElmSharp/Scroller.cs index 41f3685..41f3685 100755..100644 --- a/ElmSharp/ElmSharp/Scroller.cs +++ b/ElmSharp/ElmSharp/Scroller.cs diff --git a/ElmSharp/ElmSharp/Slider.cs b/ElmSharp/ElmSharp/Slider.cs index cd0b86a..cd0b86a 100755..100644 --- a/ElmSharp/ElmSharp/Slider.cs +++ b/ElmSharp/ElmSharp/Slider.cs diff --git a/ElmSharp/ElmSharp/Spinner.cs b/ElmSharp/ElmSharp/Spinner.cs index cc852bf..cc852bf 100755..100644 --- a/ElmSharp/ElmSharp/Spinner.cs +++ b/ElmSharp/ElmSharp/Spinner.cs diff --git a/ElmSharp/ElmSharp/Table.cs b/ElmSharp/ElmSharp/Table.cs index 5e14162..5e14162 100755..100644 --- a/ElmSharp/ElmSharp/Table.cs +++ b/ElmSharp/ElmSharp/Table.cs diff --git a/ElmSharp/ElmSharp/Toolbar.cs b/ElmSharp/ElmSharp/Toolbar.cs index 9b1dfba..b6424a5 100755..100644 --- a/ElmSharp/ElmSharp/Toolbar.cs +++ b/ElmSharp/ElmSharp/Toolbar.cs @@ -15,7 +15,6 @@ */ using System; -using System.Collections.Generic; namespace ElmSharp { @@ -36,7 +35,8 @@ namespace ElmSharp Expand } - public class ToolbarItemEventArgs : EventArgs { + public class ToolbarItemEventArgs : EventArgs + { public ToolbarItem Item { get; private set; } internal static ToolbarItemEventArgs CreateFromSmartEvent(IntPtr data, IntPtr obj, IntPtr info) diff --git a/ElmSharp/Interop/Interop.Elementary.Win.cs b/ElmSharp/Interop/Interop.Elementary.Win.cs index aadc2de..1a89ec8 100644 --- a/ElmSharp/Interop/Interop.Elementary.Win.cs +++ b/ElmSharp/Interop/Interop.Elementary.Win.cs @@ -92,7 +92,7 @@ internal static partial class Interop internal static void elm_win_wm_rotation_available_rotations_set(IntPtr obj, int[] rotations) { - IntPtr pRotations = Marshal.AllocHGlobal(Marshal.SizeOf(typeof(int)) * rotations.Length); + IntPtr pRotations = Marshal.AllocHGlobal(Marshal.SizeOf<int>() * rotations.Length); Marshal.Copy(rotations, 0, pRotations, rotations.Length); _elm_win_wm_rotation_available_rotations_set(obj, pRotations, (uint)rotations.Length); Marshal.FreeHGlobal(pRotations); diff --git a/packaging/elm-sharp.spec b/packaging/elm-sharp.spec index 2adb00e..f84fa0b 100644 --- a/packaging/elm-sharp.spec +++ b/packaging/elm-sharp.spec @@ -1,4 +1,4 @@ -%define DEV_VERSION beta-011 +%define DEV_VERSION beta-012 Name: elm-sharp Summary: C# Binding for Elementary |