From 1c7dc9eb5d802459fe1460df17ded8a6cc64afc0 Mon Sep 17 00:00:00 2001 From: Bora Hwang Date: Mon, 8 Apr 2013 15:27:10 +0900 Subject: [PATCH] [ctxpopup] update Winset GUI v4.5 press mode is changed to IMAGE type (before: RECT) mask image is deleted Change-Id: If5e134ade5f3d4c125dd993268beac7637a1dc15 --- ...pup_bubble_mask.png => 00_more_popup_press.png} | Bin 3231 -> 3029 bytes themes/inc/tizen-hd-inc.edc | 4 +- themes/widgets/ctxpopup.edc | 214 ++++++++++----------- 3 files changed, 104 insertions(+), 114 deletions(-) rename themes/images/tizen-hd/{00_popup_bubble_mask.png => 00_more_popup_press.png} (83%) mode change 100644 => 100755 diff --git a/themes/images/tizen-hd/00_popup_bubble_mask.png b/themes/images/tizen-hd/00_more_popup_press.png old mode 100644 new mode 100755 similarity index 83% rename from themes/images/tizen-hd/00_popup_bubble_mask.png rename to themes/images/tizen-hd/00_more_popup_press.png index aba1243c9ffecd11c65fc04152afb217cded1b05..d29cb705f21bfe994a1d67b486ea1450b710d1da GIT binary patch delta 322 zcmV-I0log88PyjdiBL{Q4GJ0x0000DNk~Le0000I0000I2nGNE09MY9SFs_V3V#4e zL_t(|+N{(uN&`U@hw)!VSn(L9(ge&2(uhSwj}cJNCQa@Ti-@3LAl^d3B3Q%|NV0;B z;2jik#b7g$B_L>aziOC2^TEt}Zz{Fk*a9`Qv5R%A#{CaG;}%0aLfUPDkP{?0#{?a0 za3-aFxIDf!({p3E$i%zlQ|7@cVm0E9H#{*U@#}^tQKJ2m* z@oYPwr8upCY6+rhh!rbJ5|l(hR)Xg>#I`TWONg^mlu^J{Y$^pBau_hhpnzzQcAL|A z)jAk0A-RiZe}*>09xgEZgJ2eKv7dIE+2Vhc;TT&u!xKJp`5V%hHE@Xcc^CLS0PuD- UCpUUD`Tzg`07*qoM6N<$fL3V+H; zL_t(|+U%FVZqz^!hrjh72_I`y5f8CbbI+9s&B3A}k>hq$4GvI4M#@gM^|8 zfdHLtygNH7a3Y_%3x?RCxnE;T_RP04yEED`2Zskrqq3;b5Y&7BHH7d^M2#$y%%QP|}8q_c-S+MStW)6h$wMF&}`>KnV!_WLob_U}qz^EGm9hmDF{8 z5<++eyiU{f(ip=%wc9*B5U+sCqM|BGoO37M`y*A&<2YsjXg5ID&Tvu|g?jI=MC2)u z4-9N81#b60^4@{%VhVk|G7Azv~RW%2$R!)d9j1c`3paO_g^%yvBe}7d~oO6iC z81OTI2zUj2>4NLJ#yN+o4h?<`kf`bf@Z+~)GzO7hrJE$l;G3NQ-#0Y}V+X^ zs^i33>xYClP~W~&Z)zZMGyg2_vw+5S+4zb#&Q5Ez(;2|}HW}^HNUjF}V~p18&Dnp) P00000NkvXXu0mjfUj6ZZ diff --git a/themes/inc/tizen-hd-inc.edc b/themes/inc/tizen-hd-inc.edc index 8a23be1..707d94d 100644 --- a/themes/inc/tizen-hd-inc.edc +++ b/themes/inc/tizen-hd-inc.edc @@ -99,7 +99,7 @@ #define CTXPOPUP_WIDTH_MAX_INC 620 #define CTXPOPUP_TEXT_MAX_INC 572 #define CTXPOPUP_BUBBLE_BG_IMAGE_BORDER 26 26 22 30 -#define CTXPOPUP_BUBBLE_MASK_IMAGE_BORDER 10 10 10 10 +#define CTXPOPUP_BUBBLE_BG_PRESSED_IMAGE_BORDER 8 8 8 8 #define CTXPOPUP_SHADOW_LEFT_PADDING 10 #define CTXPOPUP_SHADOW_RIGHT_PADDING 10 #define CTXPOPUP_SHADOW_TOP_PADDING 8 @@ -109,8 +109,6 @@ #define CTXPOPUP_SCROLLER_PADDING 8 #define CTXPOPUP_SCROLLER_MIN_SIZE_INC 9 18 #define CTXPOPUP_FRAME_CORNER_ARROW_PADDING 22 -#define CTXPOPUP_BG_COLOR_INC 0 0 0 0 -#define CTXPOPUP_BG_PRESS_COLOR_INC 42 137 194 255 #define CTXPOPUP_MAIN_TEXT_COLOR_INC 255 255 255 255 #define CTXPOPUP_MAIN_TEXT_DIM_COLOR_INC 255 255 255 178 #define CTXPOPUP_MAIN_TEXT_PRESS_COLOR_INC 255 255 255 255 diff --git a/themes/widgets/ctxpopup.edc b/themes/widgets/ctxpopup.edc index c80f7a8..260a6c3 100644 --- a/themes/widgets/ctxpopup.edc +++ b/themes/widgets/ctxpopup.edc @@ -1567,7 +1567,6 @@ name: "elm/ctxpopup/base/default"; images { image: "00_popup_bubble_bg.png" COMP; - image: "00_popup_bubble_mask.png" COMP; } parts { part { @@ -1859,45 +1858,6 @@ rel2 {to:"content_right_bottom_padding"; relative: 0.0 0.0;} } } - part { - name: "mask"; - type: IMAGE; - scale: 1; - description { - state: "default" 0.0; - visible: 0; - rel1 {to:"elm.swallow.content";} - rel2 {to:"elm.swallow.content";} - image { - normal: "00_popup_bubble_mask.png"; - border: CTXPOPUP_BUBBLE_MASK_IMAGE_BORDER; - border_scale: 1; - } - } - description { - state: "visible" 0.0; - inherit: "default" 0.0; - visible: 1; - rel1 {to:"elm.swallow.content";} - rel2 {to:"elm.swallow.content";} - } - } - } - programs { - program { - name: "show"; - signal: "mouse,down,1"; - source: "elm.swallow.content"; - action: STATE_SET "visible" 0.0; - target: "mask"; - } - program { - name: "hide"; - signal: "mouse,up,1"; - source: "elm.swallow.content"; - action: STATE_SET "default" 0.0; - target: "mask"; - } } } @@ -2000,6 +1960,10 @@ group { name: "elm/ctxpopup/text_style_item/default"; + images { + image: "00_more_popup_press.png" COMP; + } + data.item: "item_max_size" CTXPOPUP_TEXT_MAX_INC; parts { @@ -2015,25 +1979,34 @@ part { name: "bg"; mouse_events: 0; - type: RECT; + type: IMAGE; scale: 1; description { state: "default" 0.0; - color: CTXPOPUP_BG_COLOR_INC; - visible: 1; + visible: 0; min: (CTXPOPUP_WIDTH_MIN_INC-CTXPOPUP_CONTENT_PADDING*2) 1; max: (CTXPOPUP_WIDTH_MAX_INC-CTXPOPUP_CONTENT_PADDING*2) CTXPOPUP_ITEM_HEIGHT_MAX_INC; } description { state: "clicked" 0.0; inherit: "default" 0.0; - color: CTXPOPUP_BG_PRESS_COLOR_INC; + visible: 1; + image { + normal: "00_more_popup_press.png"; + border: CTXPOPUP_BUBBLE_BG_PRESSED_IMAGE_BORDER; + border_scale: 1; + } } description { state: "clicked_separator" 0.0; inherit: "default" 0.0; + visible: 1; rel1 { relative: 0.0 1.0; to_y: "separator2"; } - color: CTXPOPUP_BG_PRESS_COLOR_INC; + image { + normal: "00_more_popup_press.png"; + border: CTXPOPUP_BUBBLE_BG_PRESSED_IMAGE_BORDER; + border_scale: 1; + } } } part { @@ -2328,6 +2301,11 @@ /////////////////////////////////////////////////////////////////////////////// group { name: "elm/ctxpopup/text_style_item_horizontal/default"; + + images { + image: "00_more_popup_press.png" COMP; + } + parts { part { name: "event_blocker"; @@ -2341,24 +2319,31 @@ part { name: "bg"; mouse_events: 0; - type: RECT; + type: IMAGE; scale: 1; description { state: "default" 0.0; - color: CTXPOPUP_BG_COLOR_INC; - visible: 1; + visible: 0; min: CTXPOPUP_ICON_ITEM_HORIZONTAL_WIDTH_INC (CTXPOPUP_ITEM_HORIZONTAL_HEIGHT_INC-CTXPOPUP_CONTENT_PADDING*2); } description { state: "clicked" 0.0; - color: CTXPOPUP_BG_PRESS_COLOR_INC; visible: 1; + image { + normal: "00_more_popup_press.png"; + border: CTXPOPUP_BUBBLE_BG_PRESSED_IMAGE_BORDER; + border_scale: 1; + } } description { state: "clicked_separator" 0.0; rel1 { relative: 1.0 0.0; to_x: "separator2"; } - color: CTXPOPUP_BG_PRESS_COLOR_INC; visible: 1; + image { + normal: "00_more_popup_press.png"; + border: CTXPOPUP_BUBBLE_BG_PRESSED_IMAGE_BORDER; + border_scale: 1; + } } } part { @@ -2637,6 +2622,11 @@ /////////////////////////////////////////////////////////////////////////////// group { name: "elm/ctxpopup/icon_style_item/default"; + + images { + image: "00_more_popup_press.png" COMP; + } + parts { part { name: "event_blocker"; @@ -2651,24 +2641,31 @@ name: "bg"; scale: 1; mouse_events: 0; - type: RECT; + type: IMAGE; description { state: "default" 0.0; - color: CTXPOPUP_BG_COLOR_INC; - visible: 1; + visible: 0; min: CTXPOPUP_ICON_ITEM_HORIZONTAL_WIDTH_INC (CTXPOPUP_ITEM_HORIZONTAL_HEIGHT_INC-CTXPOPUP_CONTENT_PADDING*2); max: CTXPOPUP_ICON_ITEM_HORIZONTAL_WIDTH_INC (CTXPOPUP_ITEM_HORIZONTAL_HEIGHT_INC-CTXPOPUP_CONTENT_PADDING*2); } description { state: "clicked" 0.0; - color: CTXPOPUP_BG_PRESS_COLOR_INC; visible: 1; + image { + normal: "00_more_popup_press.png"; + border: CTXPOPUP_BUBBLE_BG_PRESSED_IMAGE_BORDER; + border_scale: 1; + } } description { state: "clicked_separator" 0.0; rel1 { relative: 1.0 0.0; to_x: "separator2"; } - color: CTXPOPUP_BG_PRESS_COLOR_INC; visible: 1; + image { + normal: "00_more_popup_press.png"; + border: CTXPOPUP_BUBBLE_BG_PRESSED_IMAGE_BORDER; + border_scale: 1; + } } } part { @@ -2874,6 +2871,10 @@ group { name: "elm/ctxpopup/icon_text_style_item/default"; + images { + image: "00_more_popup_press.png" COMP; + } + data.item: "item_max_size" CTXPOPUP_TEXT_MAX_INC; parts { @@ -2889,22 +2890,29 @@ part { name: "bg"; mouse_events: 0; - type: RECT; + type: IMAGE; description { state: "default" 0.0; - color: CTXPOPUP_BG_COLOR_INC; - visible: 1; + visible: 0; } description { state: "clicked" 0.0; - color: CTXPOPUP_BG_PRESS_COLOR_INC; visible: 1; + image { + normal: "00_more_popup_press.png"; + border: CTXPOPUP_BUBBLE_BG_PRESSED_IMAGE_BORDER; + border_scale: 1; + } } description { state: "clicked_separator" 0.0; rel1 { relative: 0.0 1.0; to_y: "separator2"; } - color: CTXPOPUP_BG_PRESS_COLOR_INC; visible: 1; + image { + normal: "00_more_popup_press.png"; + border: CTXPOPUP_BUBBLE_BG_PRESSED_IMAGE_BORDER; + border_scale: 1; + } } } part { @@ -3254,7 +3262,6 @@ name: "elm/ctxpopup/base/more/default"; images { image: "00_popup_bubble_bg.png" COMP; - image: "00_popup_bubble_mask.png" COMP; } parts { part { @@ -3546,50 +3553,16 @@ rel2 {to:"content_right_bottom_padding"; relative: 0.0 0.0;} } } - part { - name: "mask"; - type: IMAGE; - scale: 1; - description { - state: "default" 0.0; - visible: 0; - rel1 {to:"elm.swallow.content";} - rel2 {to:"elm.swallow.content";} - image { - normal: "00_popup_bubble_mask.png"; - border: CTXPOPUP_BUBBLE_MASK_IMAGE_BORDER; - border_scale: 1; - } - } - description { - state: "visible" 0.0; - inherit: "default" 0.0; - visible: 1; - rel1 {to:"elm.swallow.content";} - rel2 {to:"elm.swallow.content";} - } - } - } - programs { - program { - name: "show"; - signal: "mouse,down,1"; - source: "elm.swallow.content"; - action: STATE_SET "visible" 0.0; - target: "mask"; - } - program { - name: "hide"; - signal: "mouse,up,1"; - source: "elm.swallow.content"; - action: STATE_SET "default" 0.0; - target: "mask"; - } } } /////////////////////////////////////////////////////////////////////////////// group { name: "elm/ctxpopup/icon_text_style_item/more/default"; + + images { + image: "00_more_popup_press.png" COMP; + } + parts { part { name: "event_blocker"; @@ -3603,25 +3576,32 @@ part { name: "bg"; mouse_events: 0; - type: RECT; + type: IMAGE; scale: 1; description { state: "default" 0.0; - color: CTXPOPUP_BG_COLOR_INC; - visible: 1; + visible: 0; min: (CTXPOPUP_MORE_WIDTH_INC-CTXPOPUP_SHADOW_LEFT_PADDING-CTXPOPUP_SHADOW_RIGHT_PADDING-CTXPOPUP_CONTENT_PADDING*2) 1; max: (CTXPOPUP_MORE_WIDTH_INC-CTXPOPUP_SHADOW_LEFT_PADDING-CTXPOPUP_SHADOW_RIGHT_PADDING-CTXPOPUP_CONTENT_PADDING*2) CTXPOPUP_MORE_ITEM_HEIGHT_MAX_INC; } description { state: "clicked" 0.0; - color: CTXPOPUP_BG_PRESS_COLOR_INC; visible: 1; + image { + normal: "00_more_popup_press.png"; + border: CTXPOPUP_BUBBLE_BG_PRESSED_IMAGE_BORDER; + border_scale: 1; + } } description { state: "clicked_separator" 0.0; rel1 { relative: 0.0 1.0; to_y: "separator2"; } - color: CTXPOPUP_BG_PRESS_COLOR_INC; visible: 1; + image { + normal: "00_more_popup_press.png"; + border: CTXPOPUP_BUBBLE_BG_PRESSED_IMAGE_BORDER; + border_scale: 1; + } } } part { @@ -3751,7 +3731,7 @@ font: "Tizen:style=Roman"; size: CTXPOPUP_MORE_ITEM_TEXT_SIZE_INC; align: 0.0 0.5; - min: 1 1; + min: 0 1; text_class: "list_item"; } } @@ -5260,6 +5240,11 @@ group { /////////////////////////////////////////////////////////////////////////////// group { name: "elm/ctxpopup/text_style_item/toolbar_segmentedcontrol"; + + images { + image: "00_more_popup_press.png" COMP; + } + parts { part { name: "event_blocker"; @@ -5273,25 +5258,32 @@ group { part { name: "bg"; mouse_events: 0; - type: RECT; + type: IMAGE; scale: 1; description { state: "default" 0.0; - color: CTXPOPUP_BG_COLOR_INC; - visible: 1; + visible: 0; min: (CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_WIDTH_INC-CTXPOPUP_SHADOW_LEFT_PADDING-CTXPOPUP_SHADOW_RIGHT_PADDING-CTXPOPUP_CONTENT_PADDING*2) 1; max: (CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_WIDTH_INC-CTXPOPUP_SHADOW_LEFT_PADDING-CTXPOPUP_SHADOW_RIGHT_PADDING-CTXPOPUP_CONTENT_PADDING*2) CTXPOPUP_TOOLBAR_SEGMENTEDCONTROL_HEIGHT_MAX_INC; } description { state: "clicked" 0.0; - color: CTXPOPUP_BG_PRESS_COLOR_INC; visible: 1; + image { + normal: "00_more_popup_press.png"; + border: CTXPOPUP_BUBBLE_BG_PRESSED_IMAGE_BORDER; + border_scale: 1; + } } description { state: "clicked_separator" 0.0; rel1 { relative: 0.0 1.0; to_y: "separator2"; } - color: CTXPOPUP_BG_PRESS_COLOR_INC; visible: 1; + image { + normal: "00_more_popup_press.png"; + border: CTXPOPUP_BUBBLE_BG_PRESSED_IMAGE_BORDER; + border_scale: 1; + } } } part { -- 2.7.4