From 7998bed665fded697228af3e2665edbc1f04c79e Mon Sep 17 00:00:00 2001 From: WonYoung Choi Date: Mon, 6 Mar 2017 15:41:54 +0900 Subject: Remove NET45 project and Clean up code Change-Id: I7279e95988690dd859c76b07cd6aae9b85601898 --- ElmSharp.Test/ElmSharp.Test.project.json | 2 +- ElmSharp.Test/TC/ScreenInformationTest.cs | 68 +----------- ElmSharp/ElmSharp.Net45.csproj | 172 ----------------------------- ElmSharp/ElmSharp.Net45.project.json | 8 -- ElmSharp/ElmSharp.nuspec | 1 - ElmSharp/ElmSharp/Background.cs | 6 +- ElmSharp/ElmSharp/Button.cs | 0 ElmSharp/ElmSharp/Calendar.cs | 0 ElmSharp/ElmSharp/Check.cs | 0 ElmSharp/ElmSharp/Color.cs | 20 +++- ElmSharp/ElmSharp/ColorSelector.cs | 2 +- ElmSharp/ElmSharp/ColorSelectorItem.cs | 0 ElmSharp/ElmSharp/Container.cs | 4 +- ElmSharp/ElmSharp/ContextPopup.cs | 0 ElmSharp/ElmSharp/DateTimeSelector.cs | 0 ElmSharp/ElmSharp/EcoreAnimator.cs | 2 +- ElmSharp/ElmSharp/EdjeObject.cs | 3 +- ElmSharp/ElmSharp/EvasKeyEventArgs.cs | 4 +- ElmSharp/ElmSharp/EvasObject.cs | 2 +- ElmSharp/ElmSharp/FloatingButton.cs | 0 ElmSharp/ElmSharp/GenGrid.cs | 0 ElmSharp/ElmSharp/GenList.cs | 0 ElmSharp/ElmSharp/GestureLayer.cs | 34 +++--- ElmSharp/ElmSharp/Icon.cs | 0 ElmSharp/ElmSharp/Image.cs | 0 ElmSharp/ElmSharp/Index.cs | 0 ElmSharp/ElmSharp/Layout.cs | 5 +- ElmSharp/ElmSharp/List.cs | 0 ElmSharp/ElmSharp/Naviframe.cs | 2 +- ElmSharp/ElmSharp/Panel.cs | 2 +- ElmSharp/ElmSharp/Panes.cs | 0 ElmSharp/ElmSharp/Polygon.cs | 2 +- ElmSharp/ElmSharp/Popup.cs | 0 ElmSharp/ElmSharp/ProgressBar.cs | 0 ElmSharp/ElmSharp/Radio.cs | 0 ElmSharp/ElmSharp/Scroller.cs | 0 ElmSharp/ElmSharp/Slider.cs | 0 ElmSharp/ElmSharp/Spinner.cs | 0 ElmSharp/ElmSharp/Table.cs | 0 ElmSharp/ElmSharp/Toolbar.cs | 4 +- ElmSharp/Interop/Interop.Elementary.Win.cs | 2 +- packaging/elm-sharp.spec | 2 +- 42 files changed, 61 insertions(+), 286 deletions(-) delete mode 100755 ElmSharp/ElmSharp.Net45.csproj delete mode 100644 ElmSharp/ElmSharp.Net45.project.json mode change 100755 => 100644 ElmSharp/ElmSharp/Background.cs mode change 100755 => 100644 ElmSharp/ElmSharp/Button.cs mode change 100755 => 100644 ElmSharp/ElmSharp/Calendar.cs mode change 100755 => 100644 ElmSharp/ElmSharp/Check.cs mode change 100755 => 100644 ElmSharp/ElmSharp/ColorSelector.cs mode change 100755 => 100644 ElmSharp/ElmSharp/ColorSelectorItem.cs mode change 100755 => 100644 ElmSharp/ElmSharp/ContextPopup.cs mode change 100755 => 100644 ElmSharp/ElmSharp/DateTimeSelector.cs mode change 100755 => 100644 ElmSharp/ElmSharp/EdjeObject.cs mode change 100755 => 100644 ElmSharp/ElmSharp/FloatingButton.cs mode change 100755 => 100644 ElmSharp/ElmSharp/GenGrid.cs mode change 100755 => 100644 ElmSharp/ElmSharp/GenList.cs mode change 100755 => 100644 ElmSharp/ElmSharp/Icon.cs mode change 100755 => 100644 ElmSharp/ElmSharp/Image.cs mode change 100755 => 100644 ElmSharp/ElmSharp/Index.cs mode change 100755 => 100644 ElmSharp/ElmSharp/List.cs mode change 100755 => 100644 ElmSharp/ElmSharp/Naviframe.cs mode change 100755 => 100644 ElmSharp/ElmSharp/Panel.cs mode change 100755 => 100644 ElmSharp/ElmSharp/Panes.cs mode change 100755 => 100644 ElmSharp/ElmSharp/Popup.cs mode change 100755 => 100644 ElmSharp/ElmSharp/ProgressBar.cs mode change 100755 => 100644 ElmSharp/ElmSharp/Radio.cs mode change 100755 => 100644 ElmSharp/ElmSharp/Scroller.cs mode change 100755 => 100644 ElmSharp/ElmSharp/Slider.cs mode change 100755 => 100644 ElmSharp/ElmSharp/Spinner.cs mode change 100755 => 100644 ElmSharp/ElmSharp/Table.cs mode change 100755 => 100644 ElmSharp/ElmSharp/Toolbar.cs 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("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 @@ - - - - Debug - AnyCPU - {657E0754-FAF0-42B9-B9F5-45868826758E} - Library - Properties - ElmSharp - ElmSharp - 512 - v4.5 - - - true - full - true - bin\Debug\Net45\ - DEBUG;TRACE - prompt - 4 - true - - - pdbonly - true - bin\Release\Net45\ - TRACE - prompt - 4 - true - - - true - - - ElmSharp.snk - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ 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 @@ - diff --git a/ElmSharp/ElmSharp/Background.cs b/ElmSharp/ElmSharp/Background.cs old mode 100755 new mode 100644 index 5d6b023..bb25d3b --- 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 old mode 100755 new mode 100644 diff --git a/ElmSharp/ElmSharp/Calendar.cs b/ElmSharp/ElmSharp/Calendar.cs old mode 100755 new mode 100644 diff --git a/ElmSharp/ElmSharp/Check.cs b/ElmSharp/ElmSharp/Check.cs old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 index 137aa41..6036ea9 --- 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 diff --git a/ElmSharp/ElmSharp/DateTimeSelector.cs b/ElmSharp/ElmSharp/DateTimeSelector.cs old mode 100755 new mode 100644 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 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 old mode 100755 new mode 100644 index 4dc7e28..db302c7 --- 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(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 old mode 100755 new mode 100644 diff --git a/ElmSharp/ElmSharp/GenGrid.cs b/ElmSharp/ElmSharp/GenGrid.cs old mode 100755 new mode 100644 diff --git a/ElmSharp/ElmSharp/GenList.cs b/ElmSharp/ElmSharp/GenList.cs old mode 100755 new mode 100644 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(event_info)); break; case GestureType.Momentum: - action(Marshal.PtrToStructure(event_info, typeof(MomentumData))); + action(Marshal.PtrToStructure(event_info)); break; case GestureType.Line: case GestureType.Flick: - action(Marshal.PtrToStructure(event_info, typeof(LineData))); + action(Marshal.PtrToStructure(event_info)); break; case GestureType.Zoom: - action(Marshal.PtrToStructure(event_info, typeof(ZoomData))); + action(Marshal.PtrToStructure(event_info)); break; case GestureType.Rotate: - action(Marshal.PtrToStructure(event_info, typeof(RotateData))); + action(Marshal.PtrToStructure(event_info)); break; } } @@ -401,7 +401,7 @@ namespace ElmSharp /// public Int32 Y; - #pragma warning disable 3003 +#pragma warning disable 3003 /// /// The number of fingers tapped. /// @@ -411,7 +411,7 @@ namespace ElmSharp /// The timestamp. /// public UInt32 Timestamp; - #pragma warning restore 3003 +#pragma warning restore 3003 } [StructLayout(LayoutKind.Sequential)] @@ -437,7 +437,7 @@ namespace ElmSharp /// public Int32 Y2; - #pragma warning disable 3003 +#pragma warning disable 3003 /// /// Timestamp of start of final x-swipe. /// @@ -462,7 +462,7 @@ namespace ElmSharp /// Number of fingers. /// public UInt32 FingersCount; - #pragma warning restore 3003 +#pragma warning restore 3003 } [StructLayout(LayoutKind.Sequential)] @@ -488,7 +488,7 @@ namespace ElmSharp /// public Int32 Y2; - #pragma warning disable 3003 +#pragma warning disable 3003 /// /// Timestamp of start of final x-swipe. /// @@ -513,7 +513,7 @@ namespace ElmSharp /// Number of fingers. /// public UInt32 FingersCount; - #pragma warning restore 3003 +#pragma warning restore 3003 /// /// 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 old mode 100755 new mode 100644 diff --git a/ElmSharp/ElmSharp/Image.cs b/ElmSharp/ElmSharp/Image.cs old mode 100755 new mode 100644 diff --git a/ElmSharp/ElmSharp/Index.cs b/ElmSharp/ElmSharp/Index.cs old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 diff --git a/ElmSharp/ElmSharp/Naviframe.cs b/ElmSharp/ElmSharp/Naviframe.cs old mode 100755 new mode 100644 index 8944eff..109d97e --- 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 old mode 100755 new mode 100644 index 9174250..c6aac69 --- 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 old mode 100755 new mode 100644 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. /// The EvasObject to which the new Polygon will be attached as a child. /// - public Polygon (EvasObject parent) : base(parent) + public Polygon(EvasObject parent) : base(parent) { } diff --git a/ElmSharp/ElmSharp/Popup.cs b/ElmSharp/ElmSharp/Popup.cs old mode 100755 new mode 100644 diff --git a/ElmSharp/ElmSharp/ProgressBar.cs b/ElmSharp/ElmSharp/ProgressBar.cs old mode 100755 new mode 100644 diff --git a/ElmSharp/ElmSharp/Radio.cs b/ElmSharp/ElmSharp/Radio.cs old mode 100755 new mode 100644 diff --git a/ElmSharp/ElmSharp/Scroller.cs b/ElmSharp/ElmSharp/Scroller.cs old mode 100755 new mode 100644 diff --git a/ElmSharp/ElmSharp/Slider.cs b/ElmSharp/ElmSharp/Slider.cs old mode 100755 new mode 100644 diff --git a/ElmSharp/ElmSharp/Spinner.cs b/ElmSharp/ElmSharp/Spinner.cs old mode 100755 new mode 100644 diff --git a/ElmSharp/ElmSharp/Table.cs b/ElmSharp/ElmSharp/Table.cs old mode 100755 new mode 100644 diff --git a/ElmSharp/ElmSharp/Toolbar.cs b/ElmSharp/ElmSharp/Toolbar.cs old mode 100755 new mode 100644 index 9b1dfba..b6424a5 --- 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() * 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 -- cgit v1.2.3