diff options
| author | Jaehyun Cho <jae_hyun.cho@samsung.com> | 2016-10-28 10:58:28 +0900 |
|---|---|---|
| committer | Jaehyun Cho <jae_hyun.cho@samsung.com> | 2016-10-27 19:13:24 -0700 |
| commit | f5af41a0f29b9780dd1435ccc8666a15b89db78e (patch) | |
| tree | da5fcef3e7be5bcb11f5fd3c72138d4ff450e7c8 | |
| parent | b28f6d1c814afae3073f0c38accae5469884b84d (diff) | |
| download | efl-theme-tizen-mobile-f5af41a0f29b9780dd1435ccc8666a15b89db78e.tar.gz efl-theme-tizen-mobile-f5af41a0f29b9780dd1435ccc8666a15b89db78e.tar.bz2 efl-theme-tizen-mobile-f5af41a0f29b9780dd1435ccc8666a15b89db78e.zip | |
naviframe: Fix title_left_btn and title_right_btn unset logic.
Previously, unset of either title_left_btn or title_right_btn affected
the other button's size. (The other button's size shrinked.)
Now, unset of either title_left_btn or title_right_btn does not affect
the other button's size.
Change-Id: I232222cb9a58341502a5abf11fa26ed2c38ff219
| -rw-r--r-- | mobile/widgets/naviframe.edc | 40 |
1 files changed, 23 insertions, 17 deletions
diff --git a/mobile/widgets/naviframe.edc b/mobile/widgets/naviframe.edc index 29bd201a..932463d2 100644 --- a/mobile/widgets/naviframe.edc +++ b/mobile/widgets/naviframe.edc @@ -876,17 +876,20 @@ group { "elm/naviframe/item/basic/default"; signal: "elm,state,title_left_btn,hide"; source: "elm"; script { - set_state(PART:"padding_left_title", "default", 0.0); - set_state(PART:"bg_title_left_btn", "default", 0.0); set_state(PART:"title_left_btn", "default", 0.0); - set_state(PART:"padding_right_title", "default", 0.0); - set_state(PART:"bg_title_right_btn", "default", 0.0); - set_int(is_title_left_btn_visible, 0); - if (get_int(is_prev_btn_visible) == 1) { - set_state(PART:"elm.swallow.prev_btn", "default", 0.0); - set_state(PART:"padding_left_title_text", "visible_prev_btn", 0.0); - set_state(PART:"padding_right_title_text", "visible_prev_btn", 0.0); + if (get_int(is_title_right_btn_visible) == 0) { + set_state(PART:"padding_left_title", "default", 0.0); + set_state(PART:"bg_title_left_btn", "default", 0.0); + set_state(PART:"padding_right_title", "default", 0.0); + set_state(PART:"bg_title_right_btn", "default", 0.0); + + if (get_int(is_prev_btn_visible) == 1) { + set_state(PART:"elm.swallow.prev_btn", "default", 0.0); + set_state(PART:"padding_left_title_text", "visible_prev_btn", 0.0); + set_state(PART:"padding_right_title_text", "visible_prev_btn", 0.0); + } } + set_int(is_title_left_btn_visible, 0); } } program { "show_title_right_btn"; @@ -909,16 +912,19 @@ group { "elm/naviframe/item/basic/default"; signal: "elm,state,title_right_btn,hide"; source: "elm"; script { - set_state(PART:"padding_right_title", "default", 0.0); - set_state(PART:"bg_title_right_btn", "default", 0.0); set_state(PART:"title_right_btn", "default", 0.0); - set_state(PART:"padding_left_title", "default", 0.0); - set_state(PART:"bg_title_left_btn", "default", 0.0); - set_int(is_title_right_btn_visible, 0); - if (get_int(is_prev_btn_visible) == 1) { - set_state(PART:"padding_left_title_text", "visible_prev_btn", 0.0); - set_state(PART:"padding_right_title_text", "visible_prev_btn", 0.0); + if (get_int(is_title_left_btn_visible) == 0) { + set_state(PART:"padding_right_title", "default", 0.0); + set_state(PART:"bg_title_right_btn", "default", 0.0); + set_state(PART:"padding_left_title", "default", 0.0); + set_state(PART:"bg_title_left_btn", "default", 0.0); + + if (get_int(is_prev_btn_visible) == 1) { + set_state(PART:"padding_left_title_text", "visible_prev_btn", 0.0); + set_state(PART:"padding_right_title_text", "visible_prev_btn", 0.0); + } } + set_int(is_title_right_btn_visible, 0); } } program { "show_title_badge"; |