diff options
| author | Kangho Hur <kangho.hur@samsung.com> | 2017-03-15 22:55:11 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@review.vlan103.tizen.org> | 2017-03-15 22:55:11 -0700 |
| commit | 845890b0e0f1bc11daab12d3ca52a2b70978622b (patch) | |
| tree | 23d84e2584c0b905531badb91e6ef66d1f4e65ef | |
| parent | 60fad969ffe82311319771b7115eeeea88c25e41 (diff) | |
| parent | 71b6248763547ca216d98400efbb2efab70832a4 (diff) | |
| download | elm-sharp-845890b0e0f1bc11daab12d3ca52a2b70978622b.tar.gz elm-sharp-845890b0e0f1bc11daab12d3ca52a2b70978622b.tar.bz2 elm-sharp-845890b0e0f1bc11daab12d3ca52a2b70978622b.zip | |
Merge "Fix FloatingButtonTest" into tizensubmit/tizen/20170316.061513accepted/tizen/unified/20170316.102124accepted/tizen/tv/20170316.102118accepted/tizen/mobile/20170316.102109accepted/tizen/ivi/20170316.102121accepted/tizen/common/20170316.161742
| -rwxr-xr-x | ElmSharp.Test/TC/FloatingButtonTest.cs | 8 | ||||
| -rwxr-xr-x | ElmSharp/ElmSharp/FloatingButton.cs | 26 |
2 files changed, 17 insertions, 17 deletions
diff --git a/ElmSharp.Test/TC/FloatingButtonTest.cs b/ElmSharp.Test/TC/FloatingButtonTest.cs index fe43eb2..61c0a62 100755 --- a/ElmSharp.Test/TC/FloatingButtonTest.cs +++ b/ElmSharp.Test/TC/FloatingButtonTest.cs @@ -53,7 +53,7 @@ namespace ElmSharp.Test FloatingButton floatingButton = new FloatingButton(window) { - Mode = FloatingButton.FloatingButtonMode.All, + Mode = FloatingButtonMode.All, AlignmentY = -1, AlignmentX = -1, WeightX = 1, @@ -74,14 +74,14 @@ namespace ElmSharp.Test Button button1 = CreateButton(window, "Mode change to LeftRightOnly"); button1.Clicked += (s, e) => { - if (floatingButton.Mode == FloatingButton.FloatingButtonMode.All) + if (floatingButton.Mode == FloatingButtonMode.All) { - floatingButton.Mode = FloatingButton.FloatingButtonMode.LeftRightOnly; + floatingButton.Mode = FloatingButtonMode.LeftRightOnly; button1.Text = "Mode change to All"; } else { - floatingButton.Mode = FloatingButton.FloatingButtonMode.All; + floatingButton.Mode = FloatingButtonMode.All; button1.Text = "Mode change to LeftRightOnly"; } }; diff --git a/ElmSharp/ElmSharp/FloatingButton.cs b/ElmSharp/ElmSharp/FloatingButton.cs index 30ae31b..f712bf1 100755 --- a/ElmSharp/ElmSharp/FloatingButton.cs +++ b/ElmSharp/ElmSharp/FloatingButton.cs @@ -91,20 +91,20 @@ namespace ElmSharp { return Interop.Eext.eext_floatingbutton_add(parent.Handle); } + } - public enum FloatingButtonMode - { - All, - LeftRightOnly, - } + public enum FloatingButtonMode + { + All, + LeftRightOnly, + } - public enum FloatingButtonPosition - { - LeftOut, - Left, - Center, - Right, - RightOut, - } + public enum FloatingButtonPosition + { + LeftOut, + Left, + Center, + Right, + RightOut, } }
\ No newline at end of file |