From: Jaehwan Kim Date: Tue, 22 Mar 2011 06:18:00 +0000 (+0900) Subject: [controlbar] change the height, remove white space X-Git-Tag: 2.0_alpha~916^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5b18aed6488ba27a107f6e0076b1dc8b9f2df3c5;p=framework%2Fuifw%2Fefl-theme-tizen.git [controlbar] change the height, remove white space Change-Id: Icc2d42305d24998c7b082cd0feca653286204341 --- diff --git a/themes/groups/controlbar.edc b/themes/groups/controlbar.edc index ae5bb93..170fc2d 100644 --- a/themes/groups/controlbar.edc +++ b/themes/groups/controlbar.edc @@ -28,50 +28,50 @@ // controlbar icon /////////////////////////////////////////////////////////////////////////////////////// - group { name: "elm/icon/controlbar_albums/default"; min: 40 40; - images.image: "00_winset_tab_icon_albums.png" COMP; - parts { part { name: "base"; description { state: "default" 0.0; aspect: 1.0 1.0; - aspect_preference: BOTH; image.normal: "00_winset_tab_icon_albums.png"; } } } } + group { name: "elm/icon/controlbar_albums/default"; min: 40 40; + images.image: "00_winset_tab_icon_albums.png" COMP; + parts { part { name: "base"; description { state: "default" 0.0; aspect: 1.0 1.0; + aspect_preference: BOTH; image.normal: "00_winset_tab_icon_albums.png"; } } } } - group { name: "elm/icon/controlbar_artists/default"; min: 40 40; - images.image: "00_winset_tab_icon_artists.png" COMP; - parts { part { name: "base"; description { state: "default" 0.0; aspect: 1.0 1.0; - aspect_preference: BOTH; image.normal: "00_winset_tab_icon_artists.png"; } } } } + group { name: "elm/icon/controlbar_artists/default"; min: 40 40; + images.image: "00_winset_tab_icon_artists.png" COMP; + parts { part { name: "base"; description { state: "default" 0.0; aspect: 1.0 1.0; + aspect_preference: BOTH; image.normal: "00_winset_tab_icon_artists.png"; } } } } - group { name: "elm/icon/controlbar_songs/default"; min: 40 40; - images.image: "00_winset_tab_icon_songs.png" COMP; - parts { part { name: "base"; description { state: "default" 0.0; aspect: 1.0 1.0; - aspect_preference: BOTH; image.normal: "00_winset_tab_icon_songs.png"; } } } } + group { name: "elm/icon/controlbar_songs/default"; min: 40 40; + images.image: "00_winset_tab_icon_songs.png" COMP; + parts { part { name: "base"; description { state: "default" 0.0; aspect: 1.0 1.0; + aspect_preference: BOTH; image.normal: "00_winset_tab_icon_songs.png"; } } } } - group { name: "elm/icon/controlbar_more/default"; min: 40 40; - images.image: "00_winset_tab_icon_more.png" COMP; - parts { part { name: "base"; description { state: "default" 0.0; aspect: 1.0 1.0; - aspect_preference: BOTH; image.normal: "00_winset_tab_icon_more.png"; } } } } + group { name: "elm/icon/controlbar_more/default"; min: 40 40; + images.image: "00_winset_tab_icon_more.png" COMP; + parts { part { name: "base"; description { state: "default" 0.0; aspect: 1.0 1.0; + aspect_preference: BOTH; image.normal: "00_winset_tab_icon_more.png"; } } } } - group { name: "elm/icon/controlbar_playlist/default"; min: 40 40; - images.image: "00_winset_tab_icon_playlist.png" COMP; - parts { part { name: "base"; description { state: "default" 0.0; aspect: 1.0 1.0; - aspect_preference: BOTH; image.normal: "00_winset_tab_icon_playlist.png"; } } } } + group { name: "elm/icon/controlbar_playlist/default"; min: 40 40; + images.image: "00_winset_tab_icon_playlist.png" COMP; + parts { part { name: "base"; description { state: "default" 0.0; aspect: 1.0 1.0; + aspect_preference: BOTH; image.normal: "00_winset_tab_icon_playlist.png"; } } } } - group { name: "elm/icon/controlbar_contacts/default"; min: 40 40; - images.image: "00_winset_tab_icon_contacts.png" COMP; - parts { part { name: "base"; description { state: "default" 0.0; aspect: 1.0 1.0; - aspect_preference: BOTH; image.normal: "00_winset_tab_icon_contacts.png"; } } } } + group { name: "elm/icon/controlbar_contacts/default"; min: 40 40; + images.image: "00_winset_tab_icon_contacts.png" COMP; + parts { part { name: "base"; description { state: "default" 0.0; aspect: 1.0 1.0; + aspect_preference: BOTH; image.normal: "00_winset_tab_icon_contacts.png"; } } } } - group { name: "elm/icon/controlbar_dialer/default"; min: 40 40; - images.image: "00_winset_tab_icon_dialer.png" COMP; - parts { part { name: "base"; description { state: "default" 0.0; aspect: 1.0 1.0; - aspect_preference: BOTH; image.normal: "00_winset_tab_icon_dialer.png"; } } } } + group { name: "elm/icon/controlbar_dialer/default"; min: 40 40; + images.image: "00_winset_tab_icon_dialer.png" COMP; + parts { part { name: "base"; description { state: "default" 0.0; aspect: 1.0 1.0; + aspect_preference: BOTH; image.normal: "00_winset_tab_icon_dialer.png"; } } } } - group { name: "elm/icon/controlbar_favorites/default"; min: 40 40; - images.image: "00_winset_tab_icon_favorites.png" COMP; - parts { part { name: "base"; description { state: "default" 0.0; aspect: 1.0 1.0; - aspect_preference: BOTH; image.normal: "00_winset_tab_icon_favorites.png"; } } } } + group { name: "elm/icon/controlbar_favorites/default"; min: 40 40; + images.image: "00_winset_tab_icon_favorites.png" COMP; + parts { part { name: "base"; description { state: "default" 0.0; aspect: 1.0 1.0; + aspect_preference: BOTH; image.normal: "00_winset_tab_icon_favorites.png"; } } } } - group { name: "elm/icon/controlbar_logs/default"; min: 40 40; - images.image: "00_winset_tab_icon_logs.png" COMP; - parts { part { name: "base"; description { state: "default" 0.0; aspect: 1.0 1.0; - aspect_preference: BOTH; image.normal: "00_winset_tab_icon_logs.png"; } } } } + group { name: "elm/icon/controlbar_logs/default"; min: 40 40; + images.image: "00_winset_tab_icon_logs.png" COMP; + parts { part { name: "base"; description { state: "default" 0.0; aspect: 1.0 1.0; + aspect_preference: BOTH; image.normal: "00_winset_tab_icon_logs.png"; } } } } //////////////////////////////////////////////////////////////////////////////////////// // controlbar @@ -79,7 +79,7 @@ group{ name: "elm/controlbar/base/default"; - + parts{ part{ name: "bg_rect"; @@ -105,7 +105,7 @@ } description{ state: "large" 0.0; - min: 0 TAB_BAR_H; + min: 0 CONTROLBAR_LARGE_H; fixed: 0 1; align: 0.5 1.0; rel1 {relative: 0.0 1.0; offset: 0 -1;} @@ -113,7 +113,7 @@ } description{ state: "small" 0.0; - min: 0 TOOL_BAR_H; + min: 0 CONTROLBAR_SMALL_H; fixed: 0 1; align: 0.5 1.0; rel1 {relative: 0.0 1.0; offset: 0 -1;} @@ -121,7 +121,7 @@ } description{ state: "left" 0.0; - min: TAB_BAR_H 0; + min: CONTROLBAR_W 0; fixed: 1 0; align: 0.0 0.5; rel1 {relative: 0.0 0.0; offset: 0 0;} @@ -129,13 +129,13 @@ } description{ state: "right" 0.0; - min: TAB_BAR_H 0; + min: CONTROLBAR_W 0; fixed: 1 0; align: 1.0 0.5; rel1 {relative: 1.0 0.0; offset: -1 0;} rel2 {relative: 1.0 1.0; offset: -1 -1;} } - } + } part{ name: "elm.swallow.items"; type: SWALLOW; @@ -207,7 +207,7 @@ rel1 {relative: 0.0 0.0; offset: 0 0;} rel2 {relative: 1.0 1.0; offset: -1 -1;} image.normal: "00_winset_control_toolbar_bg.png"; - color: 255 255 255 255; + color: 255 255 255 255; } description{ state: "tabbar" 0.0; @@ -284,7 +284,7 @@ } } } - + group{ name: "elm/controlbar/item_bg/default"; images{ @@ -296,7 +296,7 @@ image: "00_winset_tab_focus_left.png" COMP; image: "00_winset_tab_focus_right.png" COMP; } - + parts{ part{ name: "bg_rect"; @@ -305,7 +305,7 @@ mouse_events: 1; description{ state: "default" 0.0; - min: 0 TOOL_BAR_H; + min: 0 CONTROLBAR_SMALL_H; rel1 {relative: 0.0 0.0; offset: 0 0;} rel2 {relative: 1.0 1.0; offset: -1 -1;} color: 0 0 0 0; @@ -719,7 +719,7 @@ rel1 {relative: 0.5 0.6; } rel2 {relative: 0.5 1.0; } } - } + } } programs { @@ -822,10 +822,10 @@ } } } - + group{ name: "elm/controlbar/base/navigationbar"; - + parts{ part{ name: "bg_rect"; @@ -851,7 +851,7 @@ } description{ state: "large" 0.0; - min: 0 TAB_BAR_H; + min: 0 CONTROLBAR_LARGE_H; fixed: 0 1; align: 0.5 1.0; rel1 {relative: 0.0 1.0; offset: 0 -1;} @@ -859,7 +859,7 @@ } description{ state: "small" 0.0; - min: 0 TOOL_BAR_H; + min: 0 CONTROLBAR_SMALL_H; fixed: 0 1; align: 0.5 1.0; rel1 {relative: 0.0 1.0; offset: 0 -1;} @@ -867,7 +867,7 @@ } description{ state: "left" 0.0; - min: TAB_BAR_H 0; + min: CONTROLBAR_W 0; fixed: 1 0; align: 0.0 0.5; rel1 {relative: 0.0 0.0; offset: 0 0;} @@ -875,13 +875,13 @@ } description{ state: "right" 0.0; - min: TAB_BAR_H 0; + min: CONTROLBAR_W 0; fixed: 1 0; align: 1.0 0.5; rel1 {relative: 1.0 0.0; offset: -1 0;} rel2 {relative: 1.0 1.0; offset: -1 -1;} } - } + } part{ name: "elm.swallow.items"; type: SWALLOW; @@ -954,7 +954,7 @@ rel2 {relative: 1.0 1.0; offset: -1 -1;} image.normal: "00_winset_control_top_bg.png"; image.border: 1 1 2 6; - color: 255 255 255 255; + color: 255 255 255 255; } description{ state: "tabbar" 0.0; @@ -1007,7 +1007,7 @@ group{ name: "elm/controlbar/base/navigationbar_noshadow"; - + parts{ part{ name: "bg_rect"; @@ -1033,7 +1033,7 @@ } description{ state: "large" 0.0; - min: 0 TAB_BAR_H; + min: 0 CONTROLBAR_LARGE_H; fixed: 0 1; align: 0.5 1.0; rel1 {relative: 0.0 1.0; offset: 0 -1;} @@ -1041,7 +1041,7 @@ } description{ state: "small" 0.0; - min: 0 TOOL_BAR_H; + min: 0 CONTROLBAR_SMALL_H; fixed: 0 1; align: 0.5 1.0; rel1 {relative: 0.0 1.0; offset: 0 -1;} @@ -1049,7 +1049,7 @@ } description{ state: "left" 0.0; - min: TAB_BAR_H 0; + min: CONTROLBAR_W 0; fixed: 1 0; align: 0.0 0.5; rel1 {relative: 0.0 0.0; offset: 0 0;} @@ -1057,13 +1057,13 @@ } description{ state: "right" 0.0; - min: TAB_BAR_H 0; + min: CONTROLBAR_W 0; fixed: 1 0; align: 1.0 0.5; rel1 {relative: 1.0 0.0; offset: -1 0;} rel2 {relative: 1.0 1.0; offset: -1 -1;} } - } + } part{ name: "elm.swallow.items"; type: SWALLOW; @@ -1136,7 +1136,7 @@ rel2 {relative: 1.0 1.0; offset: -1 -1;} image.normal: "00_winset_control_top_noshadow_bg.png"; image.border: 1 1 0 0; - color: 255 255 255 255; + color: 255 255 255 255; } description{ state: "tabbar" 0.0; @@ -1211,12 +1211,12 @@ tag: "tab" "\t"; } } - + group { name: "elm/label/base/controlbar"; data.item: "default_font_size" "18"; data.item: "min_font_size" "14"; data.item: "max_font_size" "60"; - + parts { part { name: "label.swallow.background"; type: SWALLOW; @@ -1289,7 +1289,7 @@ description { state: "default" 0.0; // FIXME : fixed for multiline ellipsis. // does it need to make another ellipsis style? - fixed: 0 1; + fixed: 0 1; text { style: "controlbar_textblock_style"; min: 0 1; @@ -1298,7 +1298,7 @@ description { state: "wordwrap_mode" 0.0; // FIXME : fixed for multiline ellipsis. // does it need to make another ellipsis style? - fixed: 0 1; + fixed: 0 1; text { style: "controlbar_textblock_wordwrap_style"; min: 0 1; diff --git a/themes/groups/layout.edc b/themes/groups/layout.edc index 1158d38..434442b 100644 --- a/themes/groups/layout.edc +++ b/themes/groups/layout.edc @@ -169,7 +169,7 @@ scale: 1; description { state: "default" 0.0; visible: 0; - min: 0 TAB_BAR_H; + min: 0 CONTROLBAR_LARGE_H; fixed: 0 1; rel1 { relative: 0.0 1.0; } rel2 { relative: 1.0 1.0; } diff --git a/themes/nbeat.edc b/themes/nbeat.edc index e2c2143..4454158 100644 --- a/themes/nbeat.edc +++ b/themes/nbeat.edc @@ -36,9 +36,10 @@ #define INDICATOR_H 27 #define NAVI_BAR_H 55 -#define TAB_BAR_H 86 -#define TOOL_BAR_H 74 -#define SOFTKEY_H 72 +#define CONTROLBAR_LARGE_H 78 +#define CONTROLBAR_SMALL_H 65 +#define CONTROLBAR_W 78 +#define SOFTKEY_H 72 #define SEGMENT_H 50 #define SEARCHBAR_H 67