From: Thiep Ha Date: Fri, 17 May 2013 05:15:45 +0000 (+0900) Subject: [CopyPaste] Selection Handlers: Implement GUI 1.0 (change images, size); Fix scale... X-Git-Tag: accepted/tizen/20131029.210118~286 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b807f1ec8cd22255b796a4dbcefd14014bcdfcf0;p=profile%2Fivi%2Fefl-theme-tizen.git [CopyPaste] Selection Handlers: Implement GUI 1.0 (change images, size); Fix scale issue Change-Id: I272bc0e2d4c1239aa34e9243ba670f9d67f7da8f --- diff --git a/themes/images/tizen-hd/Copy_Paste/copy&paste_Handler_left.png b/themes/images/tizen-hd/Copy_Paste/copy&paste_Handler_left.png old mode 100644 new mode 100755 index 6556b1f..f9e98fb Binary files a/themes/images/tizen-hd/Copy_Paste/copy&paste_Handler_left.png and b/themes/images/tizen-hd/Copy_Paste/copy&paste_Handler_left.png differ diff --git a/themes/images/tizen-hd/Copy_Paste/copy&paste_Handler_left_01.png b/themes/images/tizen-hd/Copy_Paste/copy&paste_Handler_left_01.png old mode 100644 new mode 100755 index 7aa4b55..6ee3b80 Binary files a/themes/images/tizen-hd/Copy_Paste/copy&paste_Handler_left_01.png and b/themes/images/tizen-hd/Copy_Paste/copy&paste_Handler_left_01.png differ diff --git a/themes/images/tizen-hd/Copy_Paste/copy&paste_Handler_left_reversed.png b/themes/images/tizen-hd/Copy_Paste/copy&paste_Handler_left_01_reverse.png similarity index 67% rename from themes/images/tizen-hd/Copy_Paste/copy&paste_Handler_left_reversed.png rename to themes/images/tizen-hd/Copy_Paste/copy&paste_Handler_left_01_reverse.png index 86163dc..2e579ed 100644 Binary files a/themes/images/tizen-hd/Copy_Paste/copy&paste_Handler_left_reversed.png and b/themes/images/tizen-hd/Copy_Paste/copy&paste_Handler_left_01_reverse.png differ diff --git a/themes/images/tizen-hd/Copy_Paste/copy&paste_Handler_left_01_reversed.png b/themes/images/tizen-hd/Copy_Paste/copy&paste_Handler_left_reverse.png old mode 100644 new mode 100755 similarity index 66% rename from themes/images/tizen-hd/Copy_Paste/copy&paste_Handler_left_01_reversed.png rename to themes/images/tizen-hd/Copy_Paste/copy&paste_Handler_left_reverse.png index 2b695d5..eac56f1 Binary files a/themes/images/tizen-hd/Copy_Paste/copy&paste_Handler_left_01_reversed.png and b/themes/images/tizen-hd/Copy_Paste/copy&paste_Handler_left_reverse.png differ diff --git a/themes/images/tizen-hd/Copy_Paste/copy&paste_Handler_right.png b/themes/images/tizen-hd/Copy_Paste/copy&paste_Handler_right.png old mode 100644 new mode 100755 index 2b695d5..2822d3d Binary files a/themes/images/tizen-hd/Copy_Paste/copy&paste_Handler_right.png and b/themes/images/tizen-hd/Copy_Paste/copy&paste_Handler_right.png differ diff --git a/themes/images/tizen-hd/Copy_Paste/copy&paste_Handler_right_01.png b/themes/images/tizen-hd/Copy_Paste/copy&paste_Handler_right_01.png index 86163dc..ffb124c 100644 Binary files a/themes/images/tizen-hd/Copy_Paste/copy&paste_Handler_right_01.png and b/themes/images/tizen-hd/Copy_Paste/copy&paste_Handler_right_01.png differ diff --git a/themes/images/tizen-hd/Copy_Paste/copy&paste_Handler_right_reversed.png b/themes/images/tizen-hd/Copy_Paste/copy&paste_Handler_right_01_reverse.png similarity index 63% rename from themes/images/tizen-hd/Copy_Paste/copy&paste_Handler_right_reversed.png rename to themes/images/tizen-hd/Copy_Paste/copy&paste_Handler_right_01_reverse.png index 7aa4b55..7b8424a 100644 Binary files a/themes/images/tizen-hd/Copy_Paste/copy&paste_Handler_right_reversed.png and b/themes/images/tizen-hd/Copy_Paste/copy&paste_Handler_right_01_reverse.png differ diff --git a/themes/images/tizen-hd/Copy_Paste/copy&paste_Handler_right_01_reversed.png b/themes/images/tizen-hd/Copy_Paste/copy&paste_Handler_right_reverse.png similarity index 67% rename from themes/images/tizen-hd/Copy_Paste/copy&paste_Handler_right_01_reversed.png rename to themes/images/tizen-hd/Copy_Paste/copy&paste_Handler_right_reverse.png index 6556b1f..2788094 100644 Binary files a/themes/images/tizen-hd/Copy_Paste/copy&paste_Handler_right_01_reversed.png and b/themes/images/tizen-hd/Copy_Paste/copy&paste_Handler_right_reverse.png differ diff --git a/themes/inc/tizen-hd-inc.edc b/themes/inc/tizen-hd-inc.edc index 3d39ff2..45cde24 100644 --- a/themes/inc/tizen-hd-inc.edc +++ b/themes/inc/tizen-hd-inc.edc @@ -946,9 +946,7 @@ #define ENTRY_PREEDIT_SUB3_COLOR_INC "#76DE37" #define ENTRY_PREEDIT_SUB4_COLOR_INC "#999999" #define ENTRY_SELECTION_BG_COLOR 183 212 247 255 -#define ENTRY_SELECTION_BLOCK_HANDLE_MIN_SIZE 60 60 -#define ENTRY_SELECTION_BLOCK_HANDLE_X_OFFSET 17 -#define ENTRY_SELECTION_BLOCK_HANDLE_Y_OFFSET 8 +#define ENTRY_SELECTION_BLOCK_HANDLE_MIN_SIZE 51 79 #define ENTRY_SELECTION_EDGE_COLOR 59 115 182 255 #define ENTRY_SELECTION_BLOCK_HANDLE_EDGE_WIDTH 4 #define MAGNIFIER_HEIGHT_FILL 182 diff --git a/themes/widgets/entry.edc b/themes/widgets/entry.edc index 3bc5d14..cc31e29 100644 --- a/themes/widgets/entry.edc +++ b/themes/widgets/entry.edc @@ -1861,15 +1861,27 @@ group { name: "elm/entry/base-password/popup"; } group { name: "elm/entry/selection/block_handle_left"; - data.item: "height" "40"; - data.item: "gap" "51"; + data.item: "height" "79"; + data.item: "gap" "32"; images { image: "copy&paste_Handler_left.png" COMP; image: "copy&paste_Handler_left_01.png" COMP; - image: "copy&paste_Handler_left_reversed.png" COMP; - image: "copy&paste_Handler_left_01_reversed.png" COMP; + image: "copy&paste_Handler_left_reverse.png" COMP; + image: "copy&paste_Handler_left_01_reverse.png" COMP; } parts { + part { name: "edge"; + type: RECT; + scale: 1; + mouse_events: 0; + description { state: "default" 0.0; + min: ENTRY_SELECTION_BLOCK_HANDLE_EDGE_WIDTH 0; + max: ENTRY_SELECTION_BLOCK_HANDLE_EDGE_WIDTH 0; + color: 0 0 0 0; + visible: 0; + align: 1 0; + } + } part { name: "handle"; mouse_events: 1; scale: 1; @@ -1878,9 +1890,7 @@ group { name: "elm/entry/base-password/popup"; fixed: 1 1; align: 1 0; min: ENTRY_SELECTION_BLOCK_HANDLE_MIN_SIZE; - max:ENTRY_SELECTION_BLOCK_HANDLE_MIN_SIZE; - rel1.offset: 0 -ENTRY_SELECTION_BLOCK_HANDLE_Y_OFFSET; - rel2.offset: ENTRY_SELECTION_BLOCK_HANDLE_X_OFFSET 0; + max: ENTRY_SELECTION_BLOCK_HANDLE_MIN_SIZE; image { normal: "copy&paste_Handler_left_01.png"; border: 0 0 0 0; @@ -1896,9 +1906,6 @@ group { name: "elm/entry/base-password/popup"; inherit: "default" 0.0; visible: 1; align: 1 1; - rel2 { - offset: ENTRY_SELECTION_BLOCK_HANDLE_X_OFFSET ENTRY_SELECTION_BLOCK_HANDLE_Y_OFFSET; - } image { normal: "copy&paste_Handler_left.png"; } @@ -1907,23 +1914,18 @@ group { name: "elm/entry/base-password/popup"; inherit: "default" 0.0; visible: 1; align: 0 0; - rel1 { - offset: -ENTRY_SELECTION_BLOCK_HANDLE_X_OFFSET -ENTRY_SELECTION_BLOCK_HANDLE_Y_OFFSET; - } + rel1 { relative: 0 0; to_x: "edge"; } image { - normal: "copy&paste_Handler_left_01_reversed.png"; + normal: "copy&paste_Handler_left_01_reverse.png"; } } description { state: "top_reversed" 0.0; inherit: "default" 0.0; visible: 1; align: 0 1; - rel1.offset: -ENTRY_SELECTION_BLOCK_HANDLE_X_OFFSET 0; - rel2 { - offset: 0 ENTRY_SELECTION_BLOCK_HANDLE_Y_OFFSET; - } + rel1 { relative: 0 0; to_x: "edge"; } image { - normal: "copy&paste_Handler_left_reversed.png"; + normal: "copy&paste_Handler_left_reverse.png"; } } } @@ -2000,15 +2002,27 @@ group { name: "elm/entry/base-password/popup"; } group { name: "elm/entry/selection/block_handle_right"; - data.item: "height" "40"; - data.item: "gap" "51"; + data.item: "height" "79"; + data.item: "gap" "32"; images { image: "copy&paste_Handler_right.png" COMP; image: "copy&paste_Handler_right_01.png" COMP; - image: "copy&paste_Handler_right_reversed.png" COMP; - image: "copy&paste_Handler_right_01_reversed.png" COMP; + image: "copy&paste_Handler_right_reverse.png" COMP; + image: "copy&paste_Handler_right_01_reverse.png" COMP; } parts { + part { name: "edge"; + type: RECT; + scale: 1; + mouse_events: 0; + description { state: "default" 0.0; + min: ENTRY_SELECTION_BLOCK_HANDLE_EDGE_WIDTH 20; + max: ENTRY_SELECTION_BLOCK_HANDLE_EDGE_WIDTH 20; + color: 0 0 0 100; + visible: 1; + align: 0 0; + } + } part { name: "handle"; mouse_events: 1; scale: 1; @@ -2018,7 +2032,6 @@ group { name: "elm/entry/base-password/popup"; align: 0 0; min: ENTRY_SELECTION_BLOCK_HANDLE_MIN_SIZE; max: ENTRY_SELECTION_BLOCK_HANDLE_MIN_SIZE; - rel1.offset: -ENTRY_SELECTION_BLOCK_HANDLE_X_OFFSET -ENTRY_SELECTION_BLOCK_HANDLE_Y_OFFSET; image { normal: "copy&paste_Handler_right.png"; border: 0 0 0 0; @@ -2034,8 +2047,6 @@ group { name: "elm/entry/base-password/popup"; inherit: "default" 0.0; visible: 1; align: 0 1; - rel1.offset: -ENTRY_SELECTION_BLOCK_HANDLE_X_OFFSET 0; - rel2.offset: 0 ENTRY_SELECTION_BLOCK_HANDLE_Y_OFFSET; image { normal: "copy&paste_Handler_right_01.png"; } @@ -2044,19 +2055,18 @@ group { name: "elm/entry/base-password/popup"; inherit: "default" 0.0; visible: 1; align: 1 0; - rel1.offset: 0 -ENTRY_SELECTION_BLOCK_HANDLE_Y_OFFSET; - rel2.offset: ENTRY_SELECTION_BLOCK_HANDLE_X_OFFSET+ENTRY_SELECTION_BLOCK_HANDLE_EDGE_WIDTH 0; + rel2 { relative: 1.0 0.0; to_x: "edge"; } image { - normal: "copy&paste_Handler_right_reversed.png"; + normal: "copy&paste_Handler_right_reverse.png"; } } description { state: "top_reversed" 0.0; inherit: "default" 0.0; visible: 1; align: 1 1; - rel2.offset: ENTRY_SELECTION_BLOCK_HANDLE_X_OFFSET+ENTRY_SELECTION_BLOCK_HANDLE_EDGE_WIDTH ENTRY_SELECTION_BLOCK_HANDLE_Y_OFFSET; + rel2 { relative: 1.0 0.0; to_x: "edge"; } image { - normal: "copy&paste_Handler_right_01_reversed.png"; + normal: "copy&paste_Handler_right_01_reverse.png"; } } } @@ -2199,9 +2209,11 @@ group { name: "elm/entry/base-password/popup"; scale: 1; mouse_events: 0; description { state: "default" 0.0; - min: ENTRY_SELECTION_BLOCK_HANDLE_EDGE_WIDTH 0; - color: 255 0 0 100; + min: 0 0; + max: 0 0; + color: 0 0 0 0; visible: 0; + align: 0 0; } } part { name: "bg"; @@ -2211,7 +2223,9 @@ group { name: "elm/entry/base-password/popup"; description { state: "default" 0.0; color: ENTRY_SELECTION_EDGE_COLOR; min: ENTRY_SELECTION_BLOCK_HANDLE_EDGE_WIDTH 0; - rel2 { relative: 0 1; to: "align"; } + max: ENTRY_SELECTION_BLOCK_HANDLE_EDGE_WIDTH -1; + rel2 { relative: 0 1; to_x: "align"; } + align: 1 0; visible: 0; } description { state: "show" 0.0; @@ -2247,6 +2261,7 @@ group { name: "elm/entry/base-password/popup"; description { state: "default" 0.0; color: ENTRY_SELECTION_EDGE_COLOR; min: ENTRY_SELECTION_BLOCK_HANDLE_EDGE_WIDTH 0; + max: ENTRY_SELECTION_BLOCK_HANDLE_EDGE_WIDTH -1; visible: 0; } description { state: "show" 0.0;