From b3326d2d053b5b56350777d1688d74037eacfc1e Mon Sep 17 00:00:00 2001 From: Jaehwan Kim Date: Wed, 29 Jun 2011 14:33:29 +0900 Subject: [PATCH] [controlbar, button] add padding in navigation style's controlbar item and remove unused code --- themes/groups/button.edc | 18 +- themes/groups/controlbar.edc | 545 +++++++++++++++++++++++-------------------- 2 files changed, 304 insertions(+), 259 deletions(-) diff --git a/themes/groups/button.edc b/themes/groups/button.edc index 6ab9fb3..5e156da 100644 --- a/themes/groups/button.edc +++ b/themes/groups/button.edc @@ -7819,10 +7819,10 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt mouse_events: 1; scale: 1; description { state: "default" 0.0; - min: 20 50; + min: 20 20; color: 0 0 0 0; - rel1.offset: 5 5; - rel2.offset: -6 -6; + rel1.offset: 0 0; + rel2.offset: -1 -1; image.normal: "00_Option_header_bt.png"; image.border: 4 4 4 4; color: 255 255 255 255; @@ -8212,10 +8212,10 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt mouse_events: 1; scale: 1; description { state: "default" 0.0; - min: 20 50; + min: 20 20; color: 0 0 0 0; - rel1.offset: 5 5; - rel2.offset: -6 -6; + rel1.offset: 0 0; + rel2.offset: -1 -1; image.normal: "00_Option_header_bt.png"; image.border: 4 4 4 4; color: 255 255 255 255; @@ -8605,10 +8605,10 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt mouse_events: 1; scale: 1; description { state: "default" 0.0; - min: 20 50; + min: 20 20; color: 0 0 0 0; - rel1.offset: 5 5; - rel2.offset: -6 -6; + rel1.offset: 0 0; + rel2.offset: -1 -1; image.normal: "00_Option_header_bt.png"; image.border: 4 4 4 4; color: 255 255 255 255; diff --git a/themes/groups/controlbar.edc b/themes/groups/controlbar.edc index cf493d0..e2bb2de 100644 --- a/themes/groups/controlbar.edc +++ b/themes/groups/controlbar.edc @@ -460,46 +460,6 @@ rel2 {to: "bg_rect";} } } - part{ - name: "elm.item.default.color"; - type: RECT; - mouse_events: 0; - description{ - state: "default" 0.0; - visible: 0; - color: 255 255 255 255; - } - } - part{ - name: "elm.tabbar.selected.color"; - type: RECT; - mouse_events: 0; - description{ - state: "default" 0.0; - visible: 0; - color: 255 255 255 255; - } - } - part{ - name: "elm.toolbar.pressed.color"; - type: RECT; - mouse_events: 0; - description{ - state: "default" 0.0; - visible: 0; - color: 151 144 139 255; - } - } - part{ - name: "elm.item.disable.color"; - type: RECT; - mouse_events: 0; - description{ - state: "default" 0.0; - visible: 0; - color: 151 144 139 255; - } - } } programs { program { @@ -625,84 +585,6 @@ } group{ - name: "elm/controlbar/item/default"; - parts{ - part{ - name: "bg_rect"; - type: RECT; - scale: 1; - mouse_events: 1; - description{ - state: "default" 0.0; - rel1 {relative: 0.0 0.0; offset: 0 0;} - rel2 {relative: 1.0 1.0; offset: -1 -1;} - color: 0 0 0 0; - } - } - part{ - name: "elm.swallow.icon"; - type: SWALLOW; - scale: 1; - mouse_events:1; - description{ - state: "default" 0.0; - min: 44 44; - max: 44 44; - fixed: 1 1; - align: 0.5 0.5; - rel1{to: "bg_rect";} - rel2{to: "bg_rect";} - } - description{ - state: "icon_text" 0.0; - inherit: "default" 0.0; - align: 0.5 1.0; - rel1 {relative: 0.0 0.1; to: "bg_rect";} - rel2 {relative: 1.0 0.0; to_x: "bg_rect"; to_y: "elm.swallow.text";} - } - } - part{ - name: "elm.swallow.text"; - type: SWALLOW; - scale: 1; - mouse_events: 1; - description{ - state: "default" 0.0; - fixed: 1 1; - align: 0.5 0.5; - rel1{relative: 0.0 0.5; to: "bg_rect";} - rel2{relative: 1.0 0.5; to: "bg_rect";} - } - description{ - state: "icon_text" 0.0; - inherit: "default" 0.0; - rel1 {relative: 0.5 0.6; } - rel2 {relative: 0.5 1.0; } - } - } - } - - programs { - program { - name: "default"; - signal: "elm,state,default"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "elm.swallow.text"; - target: "elm.swallow.icon"; - } - program { - name: "icon_text"; - signal: "elm,state,icon_text"; - source: "elm"; - action: STATE_SET "icon_text" 0.0; - target: "elm.swallow.text"; - target: "elm.swallow.icon"; - } - } - } - - group{ name: "elm/controlbar/item_bg_move/default"; images{ image: "00_winset_tabbar_focus.png" COMP; @@ -931,139 +813,302 @@ } } - styles - { - style { name: "controlbar_textblock_style"; - base: "font=SLP:style=Medium font_size=18 align=center color=#ffffff wrap=char"; - tag: "br" "\n"; - tag: "hilight" "+ font=SLP:style=Bold"; - tag: "b" "+ font=SLP:style=Bold"; - tag: "tab" "\t"; - } - style { name: "controlbar_textblock_wrap_style"; - base: "font=SLP:style=Medium font_size=18 align=center color=#ffffff wrap=mixed"; - tag: "br" "\n"; - tag: "hilight" "+ font=SLP:style=Bold"; - tag: "b" "+ font=SLP:style=Bold"; - tag: "tab" "\t"; - } - style { name: "controlbar_textblock_wordwrap_style"; - base: "font=SLP:style=Medium font_size=22 align=center color=#ffffff wrap=mixed"; - tag: "br" "\n"; - tag: "hilight" "+ font=SLP:style=Bold"; - tag: "b" "+ font=SLP:style=Bold"; - 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; - description { state: "default" 0.0; - visible: 1; - rel1 { relative: 0 0; to: "elm.text"; } - rel2 { relative: 1 1; to: "elm.text"; } - } - } - part { name: "elm.text"; - type: TEXTBLOCK; - mouse_events: 0; - scale: 1; - description { state: "default" 0.0; - text { - style: "controlbar_textblock_style"; - min: 1 1; - } - } - } - } - } - - group { name: "elm/label/base_wrap/controlbar"; - data.item: "default_font_size" "22"; - data.item: "min_font_size" "18"; - data.item: "max_font_size" "60"; - parts { - part { name: "label.swallow.background"; - type: SWALLOW; - description { state: "default" 0.0; - visible: 1; - rel1 { relative: 0 0; to: "elm.text"; } - rel2 { relative: 1 1; to: "elm.text"; } - } - } - part { name: "elm.text"; - type: TEXTBLOCK; - mouse_events: 0; - scale: 1; - multiline: 1; - description { state: "default" 0.0; - text { - style: "controlbar_textblock_wrap_style"; - min: 0 1; - } - } - } - } - } + group{ + name: "elm/controlbar/item_bg/navigationbar"; + images{ + image: "00_winset_tabbar_press.png" COMP; + image: "00_winset_tabbar_press_left.png" COMP; + image: "00_winset_tabbar_press_right.png" COMP; + image: "00_winset_toolbar_press.png" COMP; + image: "00_winset_tabbar_focus.png" COMP; + image: "00_winset_tabbar_focus_left.png" COMP; + image: "00_winset_tabbar_focus_right.png" COMP; + } - group { name: "elm/label/base_wrap_ellipsis/controlbar"; - data.item: "default_font_size" "22"; - data.item: "min_font_size" "18"; - data.item: "max_font_size" "60"; - parts { - part { name: "label.swallow.background"; - type: SWALLOW; - description { state: "default" 0.0; - visible: 1; - rel1 { relative: 0 0; to: "elm.text"; } - rel2 { relative: 1 1; to: "elm.text"; } - } - } - part { name: "elm.text"; - type: TEXTBLOCK; - mouse_events: 0; - scale: 1; - multiline: 1; - description { state: "default" 0.0; - // FIXME : fixed for multiline ellipsis. - // does it need to make another ellipsis style? - fixed: 0 1; - text { - style: "controlbar_textblock_style"; - min: 0 1; - } - } - description { state: "wordwrap_mode" 0.0; - // FIXME : fixed for multiline ellipsis. - // does it need to make another ellipsis style? - fixed: 0 1; - text { - style: "controlbar_textblock_wordwrap_style"; - min: 0 1; - } - } - } - } - programs { - program { name: "default_on"; - signal: "elm,state,default"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "elm.text"; + parts{ + part{ + name: "bg_rect"; + type: RECT; + scale: 1; + mouse_events: 1; + description{ + state: "default" 0.0; + 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; + } + } + part{ + name: "bg_img"; + type: IMAGE; + scale: 1; + mouse_events: 0; + description{ + state: "default" 0.0; + visible: 0; + rel1 {relative: 0.0 0.0; offset: 0 0;} + rel2 {relative: 1.0 1.0; offset: -1 -1;} + } + description{ + state: "pressed" 0.0; + inherit: "default" 0.0; + image.normal: "00_winset_tabbar_press.png"; + image.border: 2 2 3 2; + color: 255 255 255 50; + visible: 1; + } + description{ + state: "pressed_left" 0.0; + inherit: "default" 0.0; + image.normal: "00_winset_tabbar_press_left.png"; + image.border: 2 3 2 2; + color: 255 255 255 50; + visible: 1; + } + description{ + state: "pressed_right" 0.0; + inherit: "default" 0.0; + image.normal: "00_winset_tabbar_press_right.png"; + image.border: 3 2 2 2; + color: 255 255 255 50; + visible: 1; + } + description{ + state: "focused" 0.0; + inherit: "default" 0.0; + image.normal: "00_winset_tabbar_focus.png"; + image.border: 2 2 3 2; + visible: 1; + } + description{ + state: "focused_left" 0.0; + inherit: "default" 0.0; + image.normal: "00_winset_tabbar_focus_left.png"; + image.border: 2 3 2 2; + visible: 1; + } + description{ + state: "focused_right" 0.0; + inherit: "default" 0.0; + image.normal: "00_winset_tabbar_focus_right.png"; + image.border: 3 2 2 2; + visible: 1; + } + description{ + state: "toolbar_pressed" 0.0; + inherit: "default" 0.0; + rel1 {relative: 0.0 0.07; offset: 3 0;} + rel2 {relative: 1.0 0.93; offset: -3 0;} + image.normal: "00_winset_toolbar_press.png"; + image.border: 2 2 2 2; + visible: 1; + } + } + part{ + name: "left_line"; + type: RECT; + scale: 1; + mouse_events: 0; + description{ + state: "default" 0.0; + visible: 0; + rel1 {relative: 0.0 0.0; offset: 0 5;} + rel2 {relative: 0.0 1.0; offset: 1 -3;} + color: CONTROLBAR_SEPARATEBAR_BRIGHT_COLOR_INC; + } + description{ + state: "show" 0.0; + inherit: "default" 0.0; + visible: 1; + } + } + part{ + name: "right_line"; + type: RECT; + scale: 1; + mouse_events: 0; + description{ + state: "default" 0.0; + visible: 0; + rel1 {relative: 1.0 0.0; offset: -1 5;} + rel2 {relative: 1.0 1.0; offset: 0 -3;} + color: CONTROLBAR_SEPARATEBAR_DARK_COLOR_INC; + } + description{ + state: "show" 0.0; + inherit: "default" 0.0; + visible: 1; + } + } + part{ + name: "top_line"; + type: RECT; + scale: 1; + mouse_events: 0; + description{ + state: "default" 0.0; + visible: 0; + rel1 {relative: 0.0 0.0; offset: 5 0;} + rel2 {relative: 1.0 0.0; offset: -5 1;} + color: CONTROLBAR_SEPARATEBAR_BRIGHT_COLOR_INC; + } + description{ + state: "show" 0.0; + inherit: "default" 0.0; + visible: 1; + } + } + part{ + name: "bottom_line"; + type: RECT; + scale: 1; + mouse_events: 0; + description{ + state: "default" 0.0; + visible: 0; + rel1 {relative: 0.0 1.0; offset: 5 -1;} + rel2 {relative: 1.0 1.0; offset: -5 0;} + color: CONTROLBAR_SEPARATEBAR_DARK_COLOR_INC; + } + description{ + state: "show" 0.0; + inherit: "default" 0.0; + visible: 1; + } + } + part{ + name: "item"; + type: SWALLOW; + scale: 1; + mouse_events: 1; + description{ + state: "default" 0.0; + rel1 {to: "bg_rect"; offset: 5 10;} + rel2 {to: "bg_rect"; offset: -6 -10;} + } + } } - program { name: "wordwrap_on"; - signal: "elm,state,wordwrap"; - source: "elm"; - action: STATE_SET "wordwrap_mode" 0.0; - target: "elm.text"; + programs { + program { + name: "selected"; + signal: "elm,state,selected"; + source: "elm"; + action: STATE_SET "focused" 0.0; + target: "bg_img"; + } + program { + name: "selected_left"; + signal: "elm,state,selected_left"; + source: "elm"; + action: STATE_SET "focused_left" 0.0; + target: "bg_img"; + } + program { + name: "selected_right"; + signal: "elm,state,selected_right"; + source: "elm"; + action: STATE_SET "focused_right" 0.0; + target: "bg_img"; + } + program { + name: "pressed"; + signal: "elm,state,pressed"; + source: "elm"; + action: STATE_SET "pressed" 0.0; + target: "bg_img"; + } + program { + name: "pressed_left"; + signal: "elm,state,pressed_left"; + source: "elm"; + action: STATE_SET "pressed_left" 0.0; + target: "bg_img"; + } + program { + name: "pressed_right"; + signal: "elm,state,pressed_right"; + source: "elm"; + action: STATE_SET "pressed_right" 0.0; + target: "bg_img"; + } + program { + name: "toolbar_pressed"; + signal: "elm,state,toolbar_pressed"; + source: "elm"; + action: STATE_SET "toolbar_pressed" 0.0; + target: "bg_img"; + } + program { + name: "unselected"; + signal: "elm,state,unselected"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "bg_img"; + } + program { + name: "unpressed"; + signal: "elm,state,unpressed"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "bg_img"; + } + program { + name: "left_line_show"; + signal: "elm,state,left_line_show"; + source: "elm"; + action: STATE_SET "show" 0.0; + target: "left_line"; + } + program { + name: "left_line_hide"; + signal: "elm,state,left_line_hide"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "left_line"; + } + program { + name: "right_line_show"; + signal: "elm,state,right_line_show"; + source: "elm"; + action: STATE_SET "show" 0.0; + target: "right_line"; + } + program { + name: "right_line_hide"; + signal: "elm,state,right_line_hide"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "right_line"; + } + program { + name: "top_line_show"; + signal: "elm,state,top_line_show"; + source: "elm"; + action: STATE_SET "show" 0.0; + target: "top_line"; + } + program { + name: "top_line_hide"; + signal: "elm,state,top_line_hide"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "top_line"; + } + program { + name: "bottom_line_show"; + signal: "elm,state,bottom_line_show"; + source: "elm"; + action: STATE_SET "show" 0.0; + target: "bottom_line"; + } + program { + name: "bottom_line_hide"; + signal: "elm,state,bottom_line_hide"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "bottom_line"; + } } - } // end programs - } // end group - + } -- 2.7.4