Copy&paste, magnifier resize for HD

diff --git a/themes/groups/ctxpopup.edc b/themes/groups/ctxpopup.edc
index 1bca3c8..a952426 100644 (file)
--- a/themes/groups/ctxpopup.edc
+++ b/themes/groups/ctxpopup.edc
@@ -1670,18 +1670,7 @@
 #define CTXPOPUP_ENTRY_LIST_PADDING_TOP 6
 #define CTXPOPUP_ENTRY_LIST_PADDING_RIGHT 3
 #define CTXPOPUP_ENTRY_LIST_PADDING_BOTTOM 6
-
-#define CTXPOPUP_ENTRY_SEPARATOR_WIDTH 1
-#define CTXPOPUP_ENTRY_SEPARATOR_HEIGHT 30
-#define CTXPOPUP_ENTRY_ITEM_HEIGHT 46
-#define CTXPOPUP_ENTRY_ITEM_PADDING_WIDTH 10
-#define CTXPOPUP_ENTRY_ICON_SIZE 36
-#define CTXPOPUP_ENTRY_ITEM_WIDTH_MAX 150
-#define CTXPOPUP_ENTRY_LIST_SHADOW_PADDING 3
-#define CTXPOPUP_ENTRY_ITEM_DISABLED_COLOR 200 200 200 127
-#define CTXPOPUP_ENTRY_ARROW_SIZE_HEIGHT 15
-#define CTXPOPUP_ENTRY_ARROW_SIZE_WIDTH 30
-///////////////////////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////////////////////
        group {
                name: "elm/ctxpopup/base/extended/entry";
                alias: "elm/ctxpopup/base/extended/entry/pass_event";
@@ -1772,6 +1761,7 @@
                        part {
                                name: "elm.swallow.content";
                                type: SWALLOW;
+                               scale: 1;
                                description {
                                        state: "default" 0.0;
                                        rel1 {to: "ctxpopup_frame_rect"; relative: 0 0; }
@@ -1809,7 +1799,7 @@
                                        min: CTXPOPUP_ENTRY_ARROW_SIZE_HEIGHT CTXPOPUP_ENTRY_ARROW_SIZE_WIDTH;
                                        max: CTXPOPUP_ENTRY_ARROW_SIZE_HEIGHT CTXPOPUP_ENTRY_ARROW_SIZE_WIDTH;
                                        fixed: 1 1;
-                                       align: 0.0 0.5;
+                                       align: 0 0.5;
                                        image {
                                                normal: "copy&paste_arrow_left.png";
                                        }
@@ -1819,7 +1809,7 @@
                                        min: CTXPOPUP_ENTRY_ARROW_SIZE_HEIGHT CTXPOPUP_ENTRY_ARROW_SIZE_WIDTH;
                                        max: CTXPOPUP_ENTRY_ARROW_SIZE_HEIGHT CTXPOPUP_ENTRY_ARROW_SIZE_WIDTH;
                                        fixed: 1 1;
-                                       align: 1.0 0.5;
+                                       align: 1 0.5;
                                        image {
                                                normal: "copy&paste_arrow_right.png";
                                        }
@@ -1829,7 +1819,7 @@
                                        min: CTXPOPUP_ENTRY_ARROW_SIZE_WIDTH CTXPOPUP_ENTRY_ARROW_SIZE_HEIGHT;
                                        max: CTXPOPUP_ENTRY_ARROW_SIZE_WIDTH CTXPOPUP_ENTRY_ARROW_SIZE_HEIGHT;
                                        fixed: 1 1;
-                                       align: 0.5 0.0;
+                                       align: 0.5 0;
                                        image {
                                                normal: "copy&paste_arrow_up.png";
                                        }
@@ -1839,9 +1829,7 @@
                                        min: CTXPOPUP_ENTRY_ARROW_SIZE_WIDTH CTXPOPUP_ENTRY_ARROW_SIZE_HEIGHT;
                                        max: CTXPOPUP_ENTRY_ARROW_SIZE_WIDTH CTXPOPUP_ENTRY_ARROW_SIZE_HEIGHT;
                                        fixed: 1 1;
-                                       align: 0.5 0;
-                                       rel1.offset: 0 0;
-                                       rel2.offset: 0 0;
+                                       align: 0.5 1;
                                        image {
                                                normal: "copy&paste_arrow_down.png";
                                        }
@@ -2081,7 +2069,7 @@
                                        color: CTXPOPUP_ENTRY_ITEM_TEXT_COLOR;
                                        text {
                                                font: "SLP:style=Roman";
-                                               size: 18;
+                                               size: CTXPOPUP_ENTRY_ITEM_FONT_SIZE;
                                                align: 0.5 0.5;
                                                min: 1 1;
                                        }

diff --git a/themes/groups/entry.edc b/themes/groups/entry.edc
index 1773d77..6074636 100644 (file)
--- a/themes/groups/entry.edc
+++ b/themes/groups/entry.edc
@@ -1589,7 +1589,7 @@ group { name: "elm/entry/base-password/popup";
                                        visible: 0;
                                        fixed: 1 1;
                                        align: 1 0;
-                                       min: 30 42;
+                                       min: ENTRY_SELECTION_BLOCK_HANDLE_MIN_SIZE;
                                        color: 0 0 0 0;
                                }
                                description { state: "show" 0.0;
@@ -1604,7 +1604,7 @@ group { name: "elm/entry/base-password/popup";
                                        visible: 0;
                                        fixed: 1 1;
                                        align: 1 0;
-                                       min: 30 42;
+                                       min: ENTRY_SELECTION_BLOCK_HANDLE_MIN_SIZE;
                                        rel1 {
                                                relative: 1.1 0.0;
                                                offset: 0 -2;
@@ -1696,7 +1696,7 @@ group { name: "elm/entry/base-password/popup";
                                        visible: 0;
                                        fixed: 1 1;
                                        align: 0 0;
-                                       min: 30 42;
+                                       min: ENTRY_SELECTION_BLOCK_HANDLE_MIN_SIZE;
                                        rel1 {
                                                relative: 0.0 0.0;
                                                offset: 0 -2;
@@ -1807,8 +1807,6 @@ group { name: "elm/entry/base-password/popup";
    }
 
 
-#define MAGNIFIER_HEIGHT_FILL 114
-#define MAGNIFIER_HEIGHT_FIXED 68
 #define MAGNIFIER_SCALE 1.2
 
        group { name: "elm/entry/magnifier/fill-width";
@@ -1883,7 +1881,7 @@ group { name: "elm/entry/base-password/popup";
                                scale: 1;
                                description { state: "default" 0.0;
                                fixed: 1 1;
-                                       min: 224 MAGNIFIER_HEIGHT_FIXED;
+                                       min: MAGNIFIER_WIDTH_FIXED MAGNIFIER_HEIGHT_FIXED;
                                        align: 0.5 0.0;
                                        rel1.offset: 0 8;
                                        image {

diff --git a/themes/images/nbeat-black-hd/copy&paste_arrow_down.png b/themes/images/nbeat-black-hd/copy&paste_arrow_down.png
index 7f9e782..5bc45b3 100644 (file)
Binary files a/themes/images/nbeat-black-hd/copy&paste_arrow_down.png and b/themes/images/nbeat-black-hd/copy&paste_arrow_down.png differ

diff --git a/themes/images/nbeat-black-hd/copy&paste_arrow_left.png b/themes/images/nbeat-black-hd/copy&paste_arrow_left.png
index f3130bf..1cce80d 100644 (file)
Binary files a/themes/images/nbeat-black-hd/copy&paste_arrow_left.png and b/themes/images/nbeat-black-hd/copy&paste_arrow_left.png differ

diff --git a/themes/images/nbeat-black-hd/copy&paste_arrow_right.png b/themes/images/nbeat-black-hd/copy&paste_arrow_right.png
index e8699c7..a703d54 100644 (file)
Binary files a/themes/images/nbeat-black-hd/copy&paste_arrow_right.png and b/themes/images/nbeat-black-hd/copy&paste_arrow_right.png differ

diff --git a/themes/images/nbeat-black-hd/copy&paste_arrow_up.png b/themes/images/nbeat-black-hd/copy&paste_arrow_up.png
index 96925b9..67a1e40 100644 (file)
Binary files a/themes/images/nbeat-black-hd/copy&paste_arrow_up.png and b/themes/images/nbeat-black-hd/copy&paste_arrow_up.png differ

diff --git a/themes/images/nbeat-hd/copy&paste_arrow_down.png b/themes/images/nbeat-hd/copy&paste_arrow_down.png
index 7f9e782..efdcb3a 100644 (file)
Binary files a/themes/images/nbeat-hd/copy&paste_arrow_down.png and b/themes/images/nbeat-hd/copy&paste_arrow_down.png differ

diff --git a/themes/images/nbeat-hd/copy&paste_arrow_left.png b/themes/images/nbeat-hd/copy&paste_arrow_left.png
index f3130bf..32fd940 100644 (file)
Binary files a/themes/images/nbeat-hd/copy&paste_arrow_left.png and b/themes/images/nbeat-hd/copy&paste_arrow_left.png differ

diff --git a/themes/images/nbeat-hd/copy&paste_arrow_right.png b/themes/images/nbeat-hd/copy&paste_arrow_right.png
index e8699c7..d76b941 100644 (file)
Binary files a/themes/images/nbeat-hd/copy&paste_arrow_right.png and b/themes/images/nbeat-hd/copy&paste_arrow_right.png differ

diff --git a/themes/images/nbeat-hd/copy&paste_arrow_up.png b/themes/images/nbeat-hd/copy&paste_arrow_up.png
index 96925b9..d8a7b18 100644 (file)
Binary files a/themes/images/nbeat-hd/copy&paste_arrow_up.png and b/themes/images/nbeat-hd/copy&paste_arrow_up.png differ

diff --git a/themes/inc/nbeat-black-hd-inc.edc b/themes/inc/nbeat-black-hd-inc.edc
index b6e3c24..3c1bfba 100644 (file)
--- a/themes/inc/nbeat-black-hd-inc.edc
+++ b/themes/inc/nbeat-black-hd-inc.edc
@@ -858,6 +858,10 @@
 #define ENTRY_PREEDIT_BACKGROUND_COLOR_INC "#FFFFFF"
 #define ENTRY_PREEDIT_TEXT_COLOR_INC "#000000"
 #define ENTRY_SELECTION_BG_COLOR 90 123 138 127
+#define ENTRY_SELECTION_BLOCK_HANDLE_MIN_SIZE 48 67
+#define MAGNIFIER_HEIGHT_FILL 182
+#define MAGNIFIER_HEIGHT_FIXED 108
+#define MAGNIFIER_WIDTH_FIXED 358
 
 #define PANES_DEFAULT_FIXED_SEPERATOR_NORMAL_COLOR_INC 118 118 118 255
 
@@ -977,6 +981,17 @@
 #define CTXPOPUP_ENTRY_ITEM_TEXT_COLOR   249 249 249 255
 #define CTXPOPUP_ENTRY_ITEM_LEFT_SEPARATOR_COLOR 74 74 74 255
 #define CTXPOPUP_ENTRY_ITEM_RIGHT_SEPARATOR_COLOR 164 164 164 255
+#define CTXPOPUP_ENTRY_SEPARATOR_WIDTH 1
+#define CTXPOPUP_ENTRY_SEPARATOR_HEIGHT 48
+#define CTXPOPUP_ENTRY_ITEM_HEIGHT 73
+#define CTXPOPUP_ENTRY_ITEM_PADDING_WIDTH 16
+#define CTXPOPUP_ENTRY_ITEM_FONT_SIZE 28
+#define CTXPOPUP_ENTRY_ICON_SIZE 57
+#define CTXPOPUP_ENTRY_ITEM_WIDTH_MAX 240
+#define CTXPOPUP_ENTRY_LIST_SHADOW_PADDING 3
+#define CTXPOPUP_ENTRY_ITEM_DISABLED_COLOR 200 200 200 127
+#define CTXPOPUP_ENTRY_ARROW_SIZE_HEIGHT 28
+#define CTXPOPUP_ENTRY_ARROW_SIZE_WIDTH 48
 
 #define TICKERNOTI_DEFAULT_BG_MIN_HEIGHT_INC 98
 #define TICKERNOTI_DEFAULT_BG_BORDER_INC 0 0 0 8

diff --git a/themes/inc/nbeat-black-inc.edc b/themes/inc/nbeat-black-inc.edc
index e202e9b..e196236 100644 (file)
--- a/themes/inc/nbeat-black-inc.edc
+++ b/themes/inc/nbeat-black-inc.edc
@@ -846,6 +846,10 @@
 #define ENTRY_PREEDIT_BACKGROUND_COLOR_INC "#FFFFFF"
 #define ENTRY_PREEDIT_TEXT_COLOR_INC "#000000"
 #define ENTRY_SELECTION_BG_COLOR 90 123 138 127
+#define ENTRY_SELECTION_BLOCK_HANDLE_MIN_SIZE 30 42
+#define MAGNIFIER_HEIGHT_FILL 114
+#define MAGNIFIER_HEIGHT_FIXED 68
+#define MAGNIFIER_WIDTH_FIXED 224
 
 #define PANES_DEFAULT_FIXED_SEPERATOR_NORMAL_COLOR_INC 118 118 118 255
 
@@ -963,6 +967,17 @@
 #define CTXPOPUP_ENTRY_ITEM_TEXT_COLOR   249 249 249 255
 #define CTXPOPUP_ENTRY_ITEM_LEFT_SEPARATOR_COLOR 74 74 74 255
 #define CTXPOPUP_ENTRY_ITEM_RIGHT_SEPARATOR_COLOR 164 164 164 255
+#define CTXPOPUP_ENTRY_SEPARATOR_WIDTH 1
+#define CTXPOPUP_ENTRY_SEPARATOR_HEIGHT 30
+#define CTXPOPUP_ENTRY_ITEM_HEIGHT 46
+#define CTXPOPUP_ENTRY_ITEM_PADDING_WIDTH 10
+#define CTXPOPUP_ENTRY_ITEM_FONT_SIZE 18
+#define CTXPOPUP_ENTRY_ICON_SIZE 36
+#define CTXPOPUP_ENTRY_ITEM_WIDTH_MAX 150
+#define CTXPOPUP_ENTRY_LIST_SHADOW_PADDING 3
+#define CTXPOPUP_ENTRY_ITEM_DISABLED_COLOR 200 200 200 127
+#define CTXPOPUP_ENTRY_ARROW_SIZE_HEIGHT 15
+#define CTXPOPUP_ENTRY_ARROW_SIZE_WIDTH 30
 
 #define TICKERNOTI_DEFAULT_BG_MIN_HEIGHT_INC 55
 #define TICKERNOTI_DEFAULT_BG_BORDER_INC 0 0 0 5

diff --git a/themes/inc/nbeat-hd-inc.edc b/themes/inc/nbeat-hd-inc.edc
index e696b4d..f6febe9 100644 (file)
--- a/themes/inc/nbeat-hd-inc.edc
+++ b/themes/inc/nbeat-hd-inc.edc
@@ -875,6 +875,10 @@
 #define ENTRY_PREEDIT_BACKGROUND_COLOR_INC "#000000"
 #define ENTRY_PREEDIT_TEXT_COLOR_INC "#FFFFFF"
 #define ENTRY_SELECTION_BG_COLOR 204 230 224 127
+#define ENTRY_SELECTION_BLOCK_HANDLE_MIN_SIZE 48 67
+#define MAGNIFIER_HEIGHT_FILL 182
+#define MAGNIFIER_HEIGHT_FIXED 108
+#define MAGNIFIER_WIDTH_FIXED 358
 
 #define PANES_DEFAULT_FIXED_SEPERATOR_NORMAL_COLOR_INC 219 219 219 255
 
@@ -992,6 +996,17 @@
 #define CTXPOPUP_ENTRY_ITEM_TEXT_COLOR   249 249 249 255
 #define CTXPOPUP_ENTRY_ITEM_LEFT_SEPARATOR_COLOR 61 61 61 255
 #define CTXPOPUP_ENTRY_ITEM_RIGHT_SEPARATOR_COLOR 148 148 148 255
+#define CTXPOPUP_ENTRY_SEPARATOR_WIDTH 1
+#define CTXPOPUP_ENTRY_SEPARATOR_HEIGHT 48
+#define CTXPOPUP_ENTRY_ITEM_HEIGHT 73
+#define CTXPOPUP_ENTRY_ITEM_PADDING_WIDTH 16
+#define CTXPOPUP_ENTRY_ITEM_FONT_SIZE 28
+#define CTXPOPUP_ENTRY_ICON_SIZE 57
+#define CTXPOPUP_ENTRY_ITEM_WIDTH_MAX 240
+#define CTXPOPUP_ENTRY_LIST_SHADOW_PADDING 3
+#define CTXPOPUP_ENTRY_ITEM_DISABLED_COLOR 200 200 200 127
+#define CTXPOPUP_ENTRY_ARROW_SIZE_HEIGHT 28
+#define CTXPOPUP_ENTRY_ARROW_SIZE_WIDTH 48
 
 #define TICKERNOTI_DEFAULT_BG_MIN_HEIGHT_INC 98
 #define TICKERNOTI_DEFAULT_BG_BORDER_INC 0 0 0 8

diff --git a/themes/inc/nbeat-inc.edc b/themes/inc/nbeat-inc.edc
index a5c9ccb..b40e362 100644 (file)
--- a/themes/inc/nbeat-inc.edc
+++ b/themes/inc/nbeat-inc.edc
@@ -869,6 +869,10 @@
 #define ENTRY_PREEDIT_BACKGROUND_COLOR_INC "#000000"
 #define ENTRY_PREEDIT_TEXT_COLOR_INC "#FFFFFF"
 #define ENTRY_SELECTION_BG_COLOR 204 230 224 127
+#define ENTRY_SELECTION_BLOCK_HANDLE_MIN_SIZE 30 42
+#define MAGNIFIER_HEIGHT_FILL 114
+#define MAGNIFIER_HEIGHT_FIXED 68
+#define MAGNIFIER_WIDTH_FIXED 224
 
 #define PANES_DEFAULT_FIXED_SEPERATOR_NORMAL_COLOR_INC 219 219 219 255
 
@@ -986,6 +990,18 @@
 #define CTXPOPUP_ENTRY_ITEM_TEXT_COLOR   249 249 249 255
 #define CTXPOPUP_ENTRY_ITEM_LEFT_SEPARATOR_COLOR 61 61 61 255
 #define CTXPOPUP_ENTRY_ITEM_RIGHT_SEPARATOR_COLOR 148 148 148 255
+#define CTXPOPUP_ENTRY_SEPARATOR_WIDTH 1
+#define CTXPOPUP_ENTRY_SEPARATOR_HEIGHT 30
+#define CTXPOPUP_ENTRY_ITEM_HEIGHT 46
+#define CTXPOPUP_ENTRY_ITEM_PADDING_WIDTH 10
+#define CTXPOPUP_ENTRY_ITEM_FONT_SIZE 18
+#define CTXPOPUP_ENTRY_ICON_SIZE 36
+#define CTXPOPUP_ENTRY_ITEM_FONT_SIZE 18
+#define CTXPOPUP_ENTRY_ITEM_WIDTH_MAX 150
+#define CTXPOPUP_ENTRY_LIST_SHADOW_PADDING 3
+#define CTXPOPUP_ENTRY_ITEM_DISABLED_COLOR 200 200 200 127
+#define CTXPOPUP_ENTRY_ARROW_SIZE_HEIGHT 15
+#define CTXPOPUP_ENTRY_ARROW_SIZE_WIDTH 30
 
 #define TICKERNOTI_DEFAULT_BG_MIN_HEIGHT_INC 55
 #define TICKERNOTI_DEFAULT_BG_BORDER_INC 0 0 0 5