From e6406fe905b892284ca06e6afa267957fa30e11e Mon Sep 17 00:00:00 2001 From: Sungtaek Hong Date: Fri, 2 Jun 2017 16:44:50 +0900 Subject: toolbar: set min size for toolbar item the same with naviframe Change-Id: I692bb43ad5ec525c8ec30878f8a3e10ba7dd1354 Signed-off-by: Sungtaek Hong --- mobile/HD-inc.edc | 24 +++++++++-- mobile/widgets/toolbar.edc | 105 ++++++++++++++++++++++++++++----------------- 2 files changed, 86 insertions(+), 43 deletions(-) diff --git a/mobile/HD-inc.edc b/mobile/HD-inc.edc index 224c9d95..75769497 100644 --- a/mobile/HD-inc.edc +++ b/mobile/HD-inc.edc @@ -228,10 +228,26 @@ #define TABBAR_COMMON_SLIDE_TEXT_CHAR_GAP " " //60 (6 spaces) #define TABBAR_COMMON_SLIDE_TEXT_MAX_LENGTH (2*(256+6)) -#define TABBAR_COMMON_DEFAULT_ITEM_SIZE_INC 90 64; -#define TABBAR_COMMON_LANDSCAPE_DEFAULT_ITEM_SIZE_INC 160 64; -#define TABBAR_COMMON_SCROLL_ITEM_SIZE_INC 210 64; -#define TABBAR_COMMON_LANDSCAPE_SCROLL_ITEM_SIZE_INC 270 64; +#define TABBAR_DEFAULT_DEFAULT_ITEM_SIZE_INC 90 110; +#define TABBAR_DEFAULT_LANDSCAPE_DEFAULT_ITEM_SIZE_INC 160 110; +#define TABBAR_DEFAULT_SCROLL_ITEM_SIZE_INC 210 110; +#define TABBAR_DEFAULT_LANDSCAPE_SCROLL_ITEM_SIZE_INC 270 110; + +#define TABBAR_DEFAULT_ICON_ITEM_SIZE_INC 90 144; +#define TABBAR_DEFAULT_ICON_LANDSCAPE_ITEM_SIZE_INC 160 110; +#define TABBAR_DEFAULT_ICON_SCROLL_ITEM_SIZE_INC 210 144; +#define TABBAR_DEFAULT_ICON_LANDSCAPE_SCROLL_ITEM_SIZE_INC 270 110; + +#define TABBAR_TABBAR_WITH_TITLE_DEFAULT_ITEM_SIZE_INC 90 80; +#define TABBAR_TABBAR_WITH_TITLE_LANDSCAPE_DEFAULT_ITEM_SIZE_INC 160 80; +#define TABBAR_TABBAR_WITH_TITLE_SCROLL_ITEM_SIZE_INC 210 80; +#define TABBAR_TABBAR_WITH_TITLE_LANDSCAPE_SCROLL_ITEM_SIZE_INC 270 80; + +#define TABBAR_LIGHT_VIEW_DEFAULT_ITEM_SIZE_INC 90 64; +#define TABBAR_LIGHT_VIEW_LANDSCAPE_DEFAULT_ITEM_SIZE_INC 160 64; +#define TABBAR_LIGHT_VIEW_SCROLL_ITEM_SIZE_INC 210 64; +#define TABBAR_LIGHT_VIEW_LANDSCAPE_SCROLL_ITEM_SIZE_INC 270 64; + #define TABBAR_COMMON_SELECTED_LINE_HEIGHT_INC 4 #define TABBAR_COMMON_SELECTED_LINE_TOP_PADDING_SIZE_INC 0 3 #define TABBAR_COMMON_SELECTED_LINE_SELECT_ANIM_TIME_INC 0.33 diff --git a/mobile/widgets/toolbar.edc b/mobile/widgets/toolbar.edc index 3a37a562..bb5df004 100644 --- a/mobile/widgets/toolbar.edc +++ b/mobile/widgets/toolbar.edc @@ -439,20 +439,36 @@ group { "elm/toolbar/item/tabbar"; desc { "default"; rel1.to: "base"; rel2.to: "base"; - min: TABBAR_COMMON_DEFAULT_ITEM_SIZE_INC; + min: TABBAR_DEFAULT_DEFAULT_ITEM_SIZE_INC; color_class: "toolbar_item/default/bg"; } desc { "land"; inherit: "default"; - min: TABBAR_COMMON_LANDSCAPE_DEFAULT_ITEM_SIZE_INC; + min: TABBAR_DEFAULT_LANDSCAPE_DEFAULT_ITEM_SIZE_INC; } desc { "scroll"; inherit: "default"; - min: TABBAR_COMMON_SCROLL_ITEM_SIZE_INC; + min: TABBAR_DEFAULT_SCROLL_ITEM_SIZE_INC; } desc { "land_scroll"; inherit: "default"; - min: TABBAR_COMMON_LANDSCAPE_SCROLL_ITEM_SIZE_INC; + min: TABBAR_DEFAULT_LANDSCAPE_SCROLL_ITEM_SIZE_INC; + } + desc { "icon"; + inherit: "default"; + min: TABBAR_DEFAULT_ICON_ITEM_SIZE_INC; + } + desc { "icon_land"; + inherit: "default"; + min: TABBAR_DEFAULT_ICON_LANDSCAPE_ITEM_SIZE_INC; + } + desc { "icon_scroll"; + inherit: "default"; + min: TABBAR_DEFAULT_ICON_SCROLL_ITEM_SIZE_INC; + } + desc { "icon_land_scroll"; + inherit: "default"; + min: TABBAR_DEFAULT_ICON_LANDSCAPE_SCROLL_ITEM_SIZE_INC; } } spacer { "padding_badge_top_right"; @@ -1034,6 +1050,37 @@ group { "elm/toolbar/item/tabbar"; set_state(PART:"clipper_elm.text", "default", 0.0); set_state(PART:"clipper_elm.text.slide", "default", 0.0); } + public set_bg() { + if (get_int(icon_text)) { + if (get_int(landscape)) { + if (get_int(shrink_scroll_enabled)) { + set_state(PART:"bg_base", "icon_land_scroll", 0.0); + } else { + set_state(PART:"bg_base", "icon_land", 0.0); + } + } else { + if (get_int(shrink_scroll_enabled)) { + set_state(PART:"bg_base", "icon_scroll", 0.0); + } else { + set_state(PART:"bg_base", "icon", 0.0); + } + } + } else { + if (get_int(landscape)) { + if (get_int(shrink_scroll_enabled)) { + set_state(PART:"bg_base", "land_scroll", 0.0); + } else { + set_state(PART:"bg_base", "land", 0.0); + } + } else { + if (get_int(shrink_scroll_enabled)) { + set_state(PART:"bg_base", "scroll", 0.0); + } else { + set_state(PART:"bg_base", "default", 0.0); + } + } + } + } } programs { program { "on_selected"; @@ -1256,6 +1303,7 @@ group { "elm/toolbar/item/tabbar"; } if (get_int(selected)) set_int(g_timer_id, timer(TABBAR_COMMON_SLIDE_START_DELAY_SEC, "start_slide", 0)); + set_bg(); } } program { "on_hidden_icon"; @@ -1268,21 +1316,12 @@ group { "elm/toolbar/item/tabbar"; set_state(PART:"padding_right_bottom", "padding_text", 0.0); if (get_int(selected)) set_int(g_timer_id, timer(TABBAR_COMMON_SLIDE_START_DELAY_SEC, "start_slide", 0)); + set_bg(); } } program { "on_tab_number_item"; script { - if (get_int(landscape)) { - if (get_int(shrink_scroll_enabled)) - set_state(PART:"bg_base", "land_scroll", 0.0); - else - set_state(PART:"bg_base", "land", 0.0); - } else { - if (get_int(shrink_scroll_enabled)) - set_state(PART:"bg_base", "scroll", 0.0); - else - set_state(PART:"bg_base", "default", 0.0); - } + set_bg(); } } program { "selected_text"; @@ -1336,10 +1375,7 @@ group { "elm/toolbar/item/tabbar"; if (!get_int(landscape)) { set_int(landscape, 1); stop_slide(); - if (get_int(shrink_scroll_enabled)) - set_state(PART:"bg_base", "land_scroll", 0.0); - else - set_state(PART:"bg_base", "land", 0.0); + set_bg(); if (get_int(icon_text)) { set_state(PART:"padding_left_top", "icon_text_land", 0.0); @@ -1382,10 +1418,7 @@ group { "elm/toolbar/item/tabbar"; if (get_int(landscape)) { set_int(landscape, 0); stop_slide(); - if (get_int(shrink_scroll_enabled)) - set_state(PART:"bg_base", "scroll", 0.0); - else - set_state(PART:"bg_base", "default", 0.0); + set_bg(); if (get_int(icon_text)) { set_state(PART:"padding_left_top", "icon_text", 0.0); @@ -1420,10 +1453,7 @@ group { "elm/toolbar/item/tabbar"; program { "on_shrink_scroll"; script { set_int(shrink_scroll_enabled, 1); - if (get_int(landscape)) - set_state(PART:"bg_base", "land_scroll", 0.0); - else - set_state(PART:"bg_base", "scroll", 0.0); + set_bg(); } } program { "on_shrink_expand"; @@ -1441,10 +1471,7 @@ group { "elm/toolbar/item/tabbar"; program { "shrink_scroll_disabled"; script { set_int(shrink_scroll_enabled, 0); - if (get_int(landscape)) - set_state(PART:"bg_base", "land", 0.0); - else - set_state(PART:"bg_base", "default", 0.0); + set_bg(); } } program { "resize"; @@ -1542,20 +1569,20 @@ group { "elm/toolbar/item/tabbar_with_title"; desc { "default"; rel1.to: "base"; rel2.to: "base"; - min: TABBAR_COMMON_DEFAULT_ITEM_SIZE_INC; + min: TABBAR_TABBAR_WITH_TITLE_DEFAULT_ITEM_SIZE_INC; color_class: "toolbar_item/tabbar_with_title/bg"; } desc { "land"; inherit: "default"; - min: TABBAR_COMMON_LANDSCAPE_DEFAULT_ITEM_SIZE_INC; + min: TABBAR_TABBAR_WITH_TITLE_LANDSCAPE_DEFAULT_ITEM_SIZE_INC; } desc { "scroll"; inherit: "default"; - min: TABBAR_COMMON_SCROLL_ITEM_SIZE_INC; + min: TABBAR_TABBAR_WITH_TITLE_SCROLL_ITEM_SIZE_INC; } desc { "land_scroll"; inherit: "default"; - min: TABBAR_COMMON_LANDSCAPE_SCROLL_ITEM_SIZE_INC; + min: TABBAR_TABBAR_WITH_TITLE_LANDSCAPE_SCROLL_ITEM_SIZE_INC; } } rect { "bg_cover"; @@ -2763,20 +2790,20 @@ group { "elm/toolbar/item/light_view"; desc { "default"; rel1.to: "base"; rel2.to: "base"; - min: TABBAR_COMMON_DEFAULT_ITEM_SIZE_INC; + min: TABBAR_LIGHT_VIEW_DEFAULT_ITEM_SIZE_INC; color_class: "toolbar_item/light_view/bg"; } desc { "land"; inherit: "default"; - min: TABBAR_COMMON_LANDSCAPE_DEFAULT_ITEM_SIZE_INC; + min: TABBAR_LIGHT_VIEW_LANDSCAPE_DEFAULT_ITEM_SIZE_INC; } desc { "scroll"; inherit: "default"; - min: TABBAR_COMMON_SCROLL_ITEM_SIZE_INC; + min: TABBAR_LIGHT_VIEW_SCROLL_ITEM_SIZE_INC; } desc { "land_scroll"; inherit: "default"; - min: TABBAR_COMMON_LANDSCAPE_SCROLL_ITEM_SIZE_INC; + min: TABBAR_LIGHT_VIEW_LANDSCAPE_SCROLL_ITEM_SIZE_INC; } } rect { "bg_cover"; -- cgit v1.2.3