ctxpopup: apply Tizen 6.0 IoT GUI to copypaste ctxpopup

Change-Id: Ic4f061d9baf139bd5fbb421db3d1cd7ea6d7ce40

10 files changed, 35 insertions, 90 deletions

diff --git a/common/HD-inc.edc b/common/HD-inc.edc
index b159999..678a929 100644
--- a/common/HD-inc.edc
+++ b/common/HD-inc.edc
@@ -182,11 +182,9 @@
 #define CTXPOPUP_ARROW_PADDING_INC 0
 #define CTXPOPUP_ARROW_SIZE_INC 1 1
 #define CTXPOPUP_COPYPASTE_ITEM_HORIZONTAL_WIDTH_MIN_INC 128
-#define CTXPOPUP_COPYPASTE_TEXT_STYLE_TEXT_SIZE_INC 37
-#define CTXPOPUP_COPYPASTE_TEXT_MAX_SIZE_INC (CTXPOPUP_COPYPASTE_TEXT_SIZE_INC * 2)
-#define CTXPOPUP_COPYPASTE_ITEM_TEXT_STYLE_HEIGHT_MIN_INC 64
-#define CTXPOPUP_COPYPASTE_ITEM_TEXT_STYLE_TEXT_TOP_PADDING_INC 13
-#define CTXPOPUP_COPYPASTE_ITEM_TEXT_BOTTOM_PADDING_INC 14
+#define CTXPOPUP_COPYPASTE_ITEM_TEXT_PADDING_INC 8
+#define CTXPOPUP_COPYPASTE_ITEM_TEXT_STYLE_SIZE_INC 49 24 // 49 = 8 + 33 + 8
+#define CTXPOPUP_COPYPASTE_ITEM_SEPARATOR_HEIGHT_INC 12
 #define CTXPOPUP_COPYPASTE_ARROW_SIZE_INC 1 1
 
 //****************************************************************************//
diff --git a/common/HD/images/Assist_Views/core_contextual_popup_bg.#.png b/common/HD/images/Assist_Views/core_contextual_popup_bg.#.png
index 31c4ffa..b50c2d5 100644
--- a/common/HD/images/Assist_Views/core_contextual_popup_bg.#.png
+++ b/common/HD/images/Assist_Views/core_contextual_popup_bg.#.png
diff --git a/common/HD/images/Assist_Views/core_contextual_popup_bg_press_center.#.png b/common/HD/images/Assist_Views/core_contextual_popup_bg_press_center.#.png
deleted file mode 100644
index 40bbf2b..0000000
--- a/common/HD/images/Assist_Views/core_contextual_popup_bg_press_center.#.png
+++ /dev/null
diff --git a/common/HD/images/Assist_Views/core_contextual_popup_bg_press_left.#.png b/common/HD/images/Assist_Views/core_contextual_popup_bg_press_left.#.png
deleted file mode 100644
index 83c45b1..0000000
--- a/common/HD/images/Assist_Views/core_contextual_popup_bg_press_left.#.png
+++ /dev/null
diff --git a/common/HD/images/Assist_Views/core_contextual_popup_bg_press_right.#.png b/common/HD/images/Assist_Views/core_contextual_popup_bg_press_right.#.png
deleted file mode 100644
index f86ecef..0000000
--- a/common/HD/images/Assist_Views/core_contextual_popup_bg_press_right.#.png
+++ /dev/null
diff --git a/common/HD/images/Assist_Views/core_contextual_popup_bg_stroke.#.png b/common/HD/images/Assist_Views/core_contextual_popup_bg_stroke.#.png
deleted file mode 100644
index 126b420..0000000
--- a/common/HD/images/Assist_Views/core_contextual_popup_bg_stroke.#.png
+++ /dev/null
diff --git a/common/HD/images/Assist_Views/core_contextual_popup_list_bg_press_bottom.#.png b/common/HD/images/Assist_Views/core_contextual_popup_list_bg_press_bottom.#.png
deleted file mode 100644
index 1c6710c..0000000
--- a/common/HD/images/Assist_Views/core_contextual_popup_list_bg_press_bottom.#.png
+++ /dev/null
diff --git a/common/HD/images/Assist_Views/core_contextual_popup_list_bg_press_center.#.png b/common/HD/images/Assist_Views/core_contextual_popup_list_bg_press_center.#.png
deleted file mode 100644
index c2698be..0000000
--- a/common/HD/images/Assist_Views/core_contextual_popup_list_bg_press_center.#.png
+++ /dev/null
diff --git a/common/color_classes.edc b/common/color_classes.edc
index 5be2fae..fc512dc 100644
--- a/common/color_classes.edc
+++ b/common/color_classes.edc
@@ -663,9 +663,6 @@ color_classes {
    color_class { "ctxpopup/default/bg";
       color: 250 250 250 255;
    }
-   color_class { "ctxpopup/default/border";
-      color: 61 185 204 255;
-   }
    color_class { "ctxpopup/default/scrollbar";
       color: 61 185 204 179;
    }
@@ -801,25 +798,22 @@ color_classes {
       color: 0 150 255 153;
    }
    color_class { "entry/default/bg_cnp";
-      color: 250 250 250 255;
+      color: 0 12 43 255; // #000C2B Opacity 1
    }
    color_class { "entry/default/bg_cnp_pressed";
-      color: 61 185 204 77;
-   }
-   color_class { "entry/default/border_cnp";
-      color: 61 185 204 255;
+      color: 0 12 43 255; // #000C2B Opacity 1
    }
    color_class { "entry/default/divider_cnp";
-      color: 61 185 204 77;
+      color: 255 255 255 255;
    }
    color_class { "entry/default/text_cnp";
-      color: 0 0 0 255;
+      color: 255 255 255 255;
    }
    color_class { "entry/default/text_cnp_pressed";
-      color: 0 0 0 255;
+      color: 255 255 255 255;
    }
    color_class { "entry/default/text_cnp_disabled";
-      color: 0 0 0 115;
+      color: 195 202 210 255; // #C3CAD2 Opacity 1
    }
    color_class { "entry/default/scrollbar_cnp";
       color: 61 185 204 179;
diff --git a/common/widgets/ctxpopup.edc b/common/widgets/ctxpopup.edc
index 7e3754b..73712e0 100644
--- a/common/widgets/ctxpopup.edc
+++ b/common/widgets/ctxpopup.edc
@@ -1472,15 +1472,6 @@ group { "elm/ctxpopup/base/default";
             image: MEDIUM"images/Assist_Views/core_contextual_popup_bg.#.png" COMP;
          }
       }
-      set {
-         name: "core_contextual_popup_bg_stroke.#.png";
-         image {
-            image: SMALL"images/Assist_Views/core_contextual_popup_bg_stroke.#.png" COMP;
-         }
-         image {
-            image: MEDIUM"images/Assist_Views/core_contextual_popup_bg_stroke.#.png" COMP;
-         }
-      }
    }
 
    parts {
@@ -1755,20 +1746,6 @@ group { "elm/ctxpopup/base/default";
             align: 0.0 0.0;
          }
       }
-      image { "frame_line_bg";
-         desc { "default";
-            rel1 {
-               to: "padding_top_left_content";
-               relative: 1.0 1.0;
-            }
-            rel2 {
-               to: "padding_bottom_right_content";
-               relative: 0.0 0.0;
-            }
-            image.normal: "core_contextual_popup_bg_stroke.#.png";
-            color_class: "ctxpopup/default/border";
-         }
-      }
    }
 
    programs {
@@ -1935,11 +1912,6 @@ group { "elm/ctxpopup/base/copypaste";
             vis;
          }
       }
-      image { "frame_line_bg";
-         desc { "default";
-            color_class: "entry/default/border_cnp";
-         }
-      }
    }
 }
 
@@ -4019,11 +3991,12 @@ group { "elm/ctxpopup/text_style_item_horizontal/copypaste";
          scale;
          desc { "default";
             rel1 {
-               to: "separator";
+               to_x: "separator";
+               to_y: "base";
                relative: 1.0 0.0;
             }
             rel2.to: "base";
-            min: (CTXPOPUP_COPYPASTE_ITEM_HORIZONTAL_WIDTH_MIN_INC-1) CTXPOPUP_COPYPASTE_ITEM_TEXT_STYLE_HEIGHT_MIN_INC;
+            min: CTXPOPUP_COPYPASTE_ITEM_TEXT_STYLE_SIZE_INC;
             color_class: "entry/default/bg_cnp_pressed";
             hid;
          }
@@ -4038,55 +4011,42 @@ group { "elm/ctxpopup/text_style_item_horizontal/copypaste";
             rel.to: "base";
             align: 0.0 0.5;
             min: 0 0;
-            max: 0 -1;
+            max: 0 0;
+            fixed: 1 1;
             color_class: "entry/default/divider_cnp";
             hid;
          }
          desc { "visible";
             inherit: "default";
-            min: 2 CTXPOPUP_COPYPASTE_ITEM_TEXT_STYLE_HEIGHT_MIN_INC;
-            max: CTXPOPUP_SEPARATOR_MAX_SIZE_INC;
+            min: 1 CTXPOPUP_COPYPASTE_ITEM_SEPARATOR_HEIGHT_INC;
+            max: 1 CTXPOPUP_COPYPASTE_ITEM_SEPARATOR_HEIGHT_INC;
             vis;
          }
       }
-      spacer { "padding_top_text";
-         scale;
-         desc { "default";
-            rel.to: "base";
-            align: 0.5 0.0;
-            min: 1 CTXPOPUP_COPYPASTE_ITEM_TEXT_STYLE_TEXT_TOP_PADDING_INC;
-            max: 1 CTXPOPUP_COPYPASTE_ITEM_TEXT_STYLE_TEXT_TOP_PADDING_INC;
-            fixed: 1 1;
-         }
-      }
       text { "elm.text";
          scale;
          desc { "default";
             rel1 {
-               to_x: "padding_left_text";
-               to_y: "padding_top_text";
+               to: "padding_top_left_text";
                relative: 1.0 1.0;
             }
             rel2 {
-               to_x: "padding_right_text";
-               to_y: "padding_bottom_text";
+               to: "padding_bottom_right_text";
                relative: 0.0 0.0;
             }
-            align: 0.5 0.0;
-            min: 0 CTXPOPUP_COPYPASTE_TEXT_STYLE_TEXT_SIZE_INC;
             color_class: "entry/default/text_cnp";
             text {
                align: 0.5 0.5;
                min: 1 1;
-               font: "Tizen:weight=Light"; size: "30";
+               font: "Tizen:weight=Light"; size: "16";
                text_class: "tizen";
             }
          }
          desc { "clicked";
             inherit: "default";
             text {
-               min: 0 1;
-               font: "Tizen:weight=Light"; size: "30";
+               min: 1 1;
+               font: "Tizen:weight=Light"; size: "16";
                text_class: "tizen";
             }
             color_class: "entry/default/text_cnp_pressed";
@@ -4094,46 +4054,39 @@ group { "elm/ctxpopup/text_style_item_horizontal/copypaste";
          desc { "disabled";
             inherit: "default";
             text {
-               min: 0 1;
-               font: "Tizen:weight=Light"; size: "30";
+               min: 1 1;
+               font: "Tizen:weight=Light"; size: "16";
                text_class: "tizen";
             }
             color_class: "entry/default/text_cnp_disabled";
          }
       }
-      spacer { "padding_left_text";
+      spacer { "padding_top_left_text";
          scale;
          desc { "default";
             rel.to: "base";
-            align: 0.0 0.5;
-            min: CTXPOPUP_ITEM_TEXT_PADDING_INC 1;
-            max: CTXPOPUP_ITEM_TEXT_PADDING_INC 1;
-            fixed: 1 0;
+            rel2.relative: 0.0 0.0;
+            align: 0.0 0.0;
+            min: CTXPOPUP_COPYPASTE_ITEM_TEXT_PADDING_INC 0;
+            max: CTXPOPUP_COPYPASTE_ITEM_TEXT_PADDING_INC 0;
+            fixed: 1 1;
          }
       }
-      spacer { "padding_right_text";
+      spacer { "padding_bottom_right_text";
          scale;
          desc { "default";
             rel.to: "base";
-            align: 1.0 0.5;
-            min: CTXPOPUP_ITEM_TEXT_PADDING_INC 1;
-            max: CTXPOPUP_ITEM_TEXT_PADDING_INC 1;
-            fixed: 1 0;
-         }
-      }
-      spacer { "padding_bottom_text";
-         scale;
-         desc { "default";
-            align: 0.5 1.0;
-            min: 1 CTXPOPUP_COPYPASTE_ITEM_TEXT_BOTTOM_PADDING_INC;
-            max: 1 CTXPOPUP_COPYPASTE_ITEM_TEXT_BOTTOM_PADDING_INC;
+            rel1.relative: 1.0 1.0;
+            align: 1.0 1.0;
+            min: CTXPOPUP_COPYPASTE_ITEM_TEXT_PADDING_INC 0;
+            max: CTXPOPUP_COPYPASTE_ITEM_TEXT_PADDING_INC 0;
             fixed: 1 1;
          }
       }
       rect { "event";
          mouse;
          repeat;
-         after: "padding_bottom_text";
+         after: "padding_bottom_right_text";
          desc { "default";
             rel.to: "base";
             color: 0 0 0 0;