diff options
| author | Jeonghyun Yun <jh0506.yun@samsung.com> | 2017-02-20 20:51:29 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@review.vlan103.tizen.org> | 2017-02-20 20:51:29 -0800 |
| commit | 55264ed05f2717cdc3f73ba07eb7a465c021714c (patch) | |
| tree | b15443a10600cf929cbe0f309c9728032fb1f246 | |
| parent | 9f3268ad45fc2e527a5f8c9ee18fb4883a58367c (diff) | |
| parent | c9cdbdda36282bd5935c82ab4e74ffcaa5376259 (diff) | |
| download | elm-sharp-accepted/tizen/mobile/20170222.094404.tar.gz elm-sharp-accepted/tizen/mobile/20170222.094404.tar.bz2 elm-sharp-accepted/tizen/mobile/20170222.094404.zip | |
Merge "Do not use layout for Label and Entry." into tizensubmit/tizen_unified/20170308.100407submit/tizen/20170222.011706submit/tizen/20170221.045909accepted/tizen/tv/20170222.094428accepted/tizen/mobile/20170222.094404accepted/tizen/ivi/20170222.094444accepted/tizen/common/20170222.124346
| -rw-r--r--[-rwxr-xr-x] | ElmSharp/ElmSharp/Entry.cs | 9 | ||||
| -rw-r--r--[-rwxr-xr-x] | ElmSharp/ElmSharp/Label.cs | 9 |
2 files changed, 4 insertions, 14 deletions
diff --git a/ElmSharp/ElmSharp/Entry.cs b/ElmSharp/ElmSharp/Entry.cs index 5647f03..83a7e1b 100755..100644 --- a/ElmSharp/ElmSharp/Entry.cs +++ b/ElmSharp/ElmSharp/Entry.cs @@ -305,13 +305,8 @@ namespace ElmSharp protected override IntPtr CreateHandle(EvasObject parent) { - IntPtr handle = Interop.Elementary.elm_layout_add(parent.Handle); - Interop.Elementary.elm_layout_theme_set(handle, "layout", "elm_widget", "default"); - - RealHandle = Interop.Elementary.elm_entry_add(handle); - Interop.Elementary.elm_object_part_content_set(handle, "elm.swallow.content", RealHandle); - - return handle; + //TODO: Fix this to use layout + return Interop.Elementary.elm_entry_add(parent.Handle); } } } diff --git a/ElmSharp/ElmSharp/Label.cs b/ElmSharp/ElmSharp/Label.cs index 1bcb5b3..6c30010 100755..100644 --- a/ElmSharp/ElmSharp/Label.cs +++ b/ElmSharp/ElmSharp/Label.cs @@ -100,13 +100,8 @@ namespace ElmSharp protected override IntPtr CreateHandle(EvasObject parent) { - IntPtr handle = Interop.Elementary.elm_layout_add(parent.Handle); - Interop.Elementary.elm_layout_theme_set(handle, "layout", "elm_widget", "default"); - - RealHandle = Interop.Elementary.elm_label_add(handle); - Interop.Elementary.elm_object_part_content_set(handle, "elm.swallow.content", RealHandle); - - return handle; + //TODO: Fix this to use layout + return Interop.Elementary.elm_label_add(parent.Handle); } } |