[ctxpopup] adjusted some issues in devel/uifw/master

1. indentation
2. PLM issue: dimmed color of text and icon

Change-Id: Icfcaaacd314c5526796054d74a45cac446de0a1d

diff --git a/themes/inc/tizen-dark-inc.edc b/themes/inc/tizen-dark-inc.edc
index d603583..727155c 100755 (executable)
--- a/themes/inc/tizen-dark-inc.edc
+++ b/themes/inc/tizen-dark-inc.edc
@@ -102,6 +102,8 @@
 #define CTXPOPUP_SCROLLER_V_MIN_SIZE_INC 9 18
 #define CTXPOPUP_SCROLLER_H_MIN_SIZE_INC 18 9
 #define CTXPOPUP_FRAME_CORNER_ARROW_PADDING 18
+#define CTXPOPUP_ICON_CLIP_DEFAULT_COLOR_INC 255 255 255 255
+#define CTXPOPUP_ICON_CLIP_DIM_COLOR_INC 255 255 255 76
 #define CTXPOPUP_MAIN_TEXT_COLOR_INC 255 255 255 255
 #define CTXPOPUP_MAIN_TEXT_DIM_COLOR_INC 255 255 255 76
 #define CTXPOPUP_MAIN_TEXT_PRESS_COLOR_INC 255 255 255 255

diff --git a/themes/inc/tizen-light-inc.edc b/themes/inc/tizen-light-inc.edc
index 947e649..ddff958 100755 (executable)
--- a/themes/inc/tizen-light-inc.edc
+++ b/themes/inc/tizen-light-inc.edc
@@ -129,11 +129,13 @@
 #define CTXPOPUP_SCROLLER_V_MIN_SIZE_INC 9 18
 #define CTXPOPUP_SCROLLER_H_MIN_SIZE_INC 18 9
 #define CTXPOPUP_FRAME_CORNER_ARROW_PADDING 18
+#define CTXPOPUP_ICON_CLIP_DEFAULT_COLOR_INC 255 255 255 255
+#define CTXPOPUP_ICON_CLIP_DIM_COLOR_INC 255 255 255 76
 #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_DIM_COLOR_INC 255 255 255 76
 #define CTXPOPUP_MAIN_TEXT_PRESS_COLOR_INC 255 255 255 255
 #define CTXPOPUP_LIST_MAIN_TEXT_COLOR_INC 255 255 255 255
-#define CTXPOPUP_LIST_MAIN_TEXT_DIM_COLOR_INC 255 255 255 178
+#define CTXPOPUP_LIST_MAIN_TEXT_DIM_COLOR_INC 255 255 255 76
 #define CTXPOPUP_LIST_MAIN_TEXT_PRESS_COLOR_INC 255 255 255 255
 #define CTXPOPUP_SEPARATOR_PXLINE_SIZE_INC 1
 #define CTXPOPUP_SEPARATOR_PADDING_INC 20

diff --git a/themes/widgets/ctxpopup.edc b/themes/widgets/ctxpopup.edc
index d37e568..8e5b3b2 100644 (file)
--- a/themes/widgets/ctxpopup.edc
+++ b/themes/widgets/ctxpopup.edc
@@ -1855,99 +1855,100 @@ group {
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-       group { name: "elm/ctxpopup/arrow/default";
-               images {
-                       image: "00_popup_bubble_tail_left.png" COMP;
-                       image: "00_popup_bubble_tail_right.png" COMP;
-                       image: "00_popup_bubble_tail_top.png" COMP;
-                       image: "00_popup_bubble_tail_bottom.png" COMP;
-               }
-               parts {
-                       part {
-                               name: "ctxpopup_arrow";
-                               type: IMAGE;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       min: CTXPOPUP_ARROW_SIZE_INC;
-                                       max: CTXPOPUP_ARROW_SIZE_INC;
-                                       fixed: 1 1;
-                                       visible: 0;
-                                       align: 0.5 0.5;
-                               }
-                               description {
-                                       state: "left" 0.0;
-                                       min: CTXPOPUP_ARROW_SIZE_INC;
-                                       max: CTXPOPUP_ARROW_SIZE_INC;
-                                       fixed: 1 1;
-                                       align: 1.0 0.5;
-                                       image {
-                                               normal: "00_popup_bubble_tail_left.png";
-                                       }
-                               }
-                               description {
-                                       state: "right" 0.0;
-                                       min: CTXPOPUP_ARROW_SIZE_INC;
-                                       max: CTXPOPUP_ARROW_SIZE_INC;
-                                       fixed: 1 1;
-                                       align: 0.0 0.5;
-                                       image {
-                                               normal: "00_popup_bubble_tail_right.png";
-                                       }
-                               }
-                               description {
-                                       state: "top" 0.0;
-                                       min: CTXPOPUP_ARROW_SIZE_INC;
-                                       max: CTXPOPUP_ARROW_SIZE_INC;
-                                       fixed: 1 1;
-                                       align: 0.5 1.0;
-                                       image {
-                                               normal: "00_popup_bubble_tail_top.png";
-                                       }
-                               }
-                               description {
-                                       state: "bottom" 0.0;
-                                       min: CTXPOPUP_ARROW_SIZE_INC;
-                                       max: CTXPOPUP_ARROW_SIZE_INC;
-                                       fixed: 1 1;
-                                       align: 0.5 0.0;
-                                       image {
-                                               normal: "00_popup_bubble_tail_bottom.png";
-                                       }
-                               }
-                       }
-               }
-               programs {
-                       program {
-                               name: "enable_left_arrow";
-                               signal: "elm,state,left";
-                               source: "elm";
-                               action: STATE_SET "left" 0.0;
-                               target: "ctxpopup_arrow";
-                       }
-                       program {
-                               name: "enable_right_arrow";
-                               signal: "elm,state,right";
-                               source: "elm";
-                               action: STATE_SET "right" 0.0;
-                               target: "ctxpopup_arrow";
-                       }
-                       program {
-                               name: "enable_top_arrow";
-                               signal: "elm,state,top";
-                               source: "elm";
-                               action: STATE_SET "top" 0.0;
-                               target: "ctxpopup_arrow";
-                       }
-                       program {
-                               name: "enable_bottom_arrow";
-                               signal: "elm,state,bottom";
-                               source: "elm";
-                               action: STATE_SET "bottom" 0.0;
-                               target: "ctxpopup_arrow";
-                       }
-               }
-       }
+group {
+   name: "elm/ctxpopup/arrow/default";
+   images {
+      image: "00_popup_bubble_tail_left.png" COMP;
+      image: "00_popup_bubble_tail_right.png" COMP;
+      image: "00_popup_bubble_tail_top.png" COMP;
+      image: "00_popup_bubble_tail_bottom.png" COMP;
+   }
+   parts {
+      part {
+         name: "ctxpopup_arrow";
+         type: IMAGE;
+         scale: 1;
+         description {
+            state: "default" 0.0;
+            min: CTXPOPUP_ARROW_SIZE_INC;
+            max: CTXPOPUP_ARROW_SIZE_INC;
+            fixed: 1 1;
+            visible: 0;
+            align: 0.5 0.5;
+         }
+         description {
+            state: "left" 0.0;
+            min: CTXPOPUP_ARROW_SIZE_INC;
+            max: CTXPOPUP_ARROW_SIZE_INC;
+            fixed: 1 1;
+            align: 1.0 0.5;
+            image {
+               normal: "00_popup_bubble_tail_left.png";
+            }
+         }
+         description {
+            state: "right" 0.0;
+            min: CTXPOPUP_ARROW_SIZE_INC;
+            max: CTXPOPUP_ARROW_SIZE_INC;
+            fixed: 1 1;
+            align: 0.0 0.5;
+            image {
+               normal: "00_popup_bubble_tail_right.png";
+            }
+         }
+         description {
+            state: "top" 0.0;
+            min: CTXPOPUP_ARROW_SIZE_INC;
+            max: CTXPOPUP_ARROW_SIZE_INC;
+            fixed: 1 1;
+            align: 0.5 1.0;
+            image {
+               normal: "00_popup_bubble_tail_top.png";
+            }
+         }
+         description {
+            state: "bottom" 0.0;
+            min: CTXPOPUP_ARROW_SIZE_INC;
+            max: CTXPOPUP_ARROW_SIZE_INC;
+            fixed: 1 1;
+            align: 0.5 0.0;
+            image {
+               normal: "00_popup_bubble_tail_bottom.png";
+            }
+         }
+      }
+   }
+   programs {
+      program {
+         name: "enable_left_arrow";
+         signal: "elm,state,left";
+         source: "elm";
+         action: STATE_SET "left" 0.0;
+         target: "ctxpopup_arrow";
+      }
+      program {
+         name: "enable_right_arrow";
+         signal: "elm,state,right";
+         source: "elm";
+         action: STATE_SET "right" 0.0;
+         target: "ctxpopup_arrow";
+      }
+      program {
+         name: "enable_top_arrow";
+         signal: "elm,state,top";
+         source: "elm";
+         action: STATE_SET "top" 0.0;
+         target: "ctxpopup_arrow";
+      }
+      program {
+         name: "enable_bottom_arrow";
+         signal: "elm,state,bottom";
+         source: "elm";
+         action: STATE_SET "bottom" 0.0;
+         target: "ctxpopup_arrow";
+      }
+   }
+}
 ///////////////////////////////////////////////////////////////////////////////
 group {
    name: "elm/ctxpopup/text_style_item/default";
@@ -2947,6 +2948,7 @@ group {
          name: "bg";
          mouse_events: 0;
          type: IMAGE;
+         scale: 1;
          description {
             state: "default" 0.0;
             visible: 0;
@@ -3321,111 +3323,111 @@ group {
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-       group {
-               name: "elm/ctxpopup/base/more/default";
-               images {
-                       image: "00_popup_bubble_02_bg.png" COMP;
-               }
-               parts {
-                       part {
-                               name:"frame_shadow_left_top_padding";
-                               type:RECT;
-                               scale: 1;
-                               mouse_events: 0;
-                               description {
-                                       state: "default" 0.0;
-                                       min: CTXPOPUP_SHADOW_LEFT_PADDING CTXPOPUP_SHADOW_TOP_PADDING;
-                                       max: CTXPOPUP_SHADOW_LEFT_PADDING CTXPOPUP_SHADOW_TOP_PADDING;
-                                       rel2 { relative: 0 0; }
-                                       align: 0 0;
-                                       fixed: 1 1;
-                                       visible: 0;
-                               }
-                       }
-                       part {
-                               name:"frame_shadow_right_bottom_padding";
-                               type:RECT;
-                               scale: 1;
-                               mouse_events: 0;
-                               description {
-                                       state: "default" 0.0;
-                                       min: CTXPOPUP_SHADOW_RIGHT_PADDING 0;
-                                       max: CTXPOPUP_SHADOW_RIGHT_PADDING 0;
-                                       rel1{relative: 1 1;}
-                                       align: 1 1;
-                                       fixed: 1 1;
-                                       visible: 0;
-                               }
-                       }
-                       part {
-                               name: "frame_bg";
-                               type: IMAGE;
-                               scale: 1;
-                               mouse_events: 0;
-                               description {
-                                       state: "default" 0.0;
-                                       rel1 {to:"frame_shadow_left_top_padding";}
-                                       rel2 {to:"frame_shadow_right_bottom_padding";}
-                                       min: CTXPOPUP_MORE_WIDTH_MIN_INC 0;
-                                       image {
-                                               normal: "00_popup_bubble_02_bg.png";
-                                               border: CTXPOPUP_BUBBLE_MORE_BG_IMAGE_BORDER;
-                                               border_scale: 1;
-                                       }
-                               }
-                       }
-                       part {
-                               name:"content_left_top_padding";
-                               type:RECT;
-                               scale: 1;
-                               mouse_events: 0;
-                               description {
-                                       state: "default" 0.0;
-                                       min: CTXPOPUP_CONTENT_PADDING_WIDTH CTXPOPUP_CONTENT_PADDING_HEIGHT;
-                                       max: CTXPOPUP_CONTENT_PADDING_WIDTH CTXPOPUP_CONTENT_PADDING_HEIGHT;
-                                       rel1 {to:"frame_shadow_left_top_padding";  relative: 1.0 1.0;}
-                                       align: 0 0;
-                                       fixed: 1 1;
-                                       visible: 0;
-                               }
-                       }
-                       part {
-                               name:"content_right_bottom_padding";
-                               type:RECT;
-                               scale: 1;
-                               mouse_events: 0;
-                               description {
-                                       state: "default" 0.0;
-                                       min: CTXPOPUP_CONTENT_PADDING_WIDTH 0;
-                                       max: CTXPOPUP_CONTENT_PADDING_WIDTH 0;
-                                       rel2 {to:"frame_shadow_right_bottom_padding";  relative: 0.0 0.0;}
-                                       align: 1 1;
-                                       fixed: 1 1;
-                                       visible: 0;
-                               }
-                       }
-                       part {
-                               name: "elm.swallow.content";
-                               type: SWALLOW;
-                               description {
-                                       state: "default" 0.0;
-                                       align: 0 0;
-                                       rel1 {to:"content_left_top_padding";  relative: 1.0 1.0;}
-                                       rel2 {to:"content_right_bottom_padding";  relative: 0.0 0.0;}
-                               }
-                       }
-                       part { name: "access.outline";
-                               type: RECT;
-                               repeat_events: 1;
-                               description { state: "default" 0.0;
-                                       fixed: 1 1;
-                                       rel1.to: "frame_bg";
-                                       rel2.to: "frame_bg";
-                                       color: 0 0 0 0;
-                               }
-                       }
-               }
-       }
+group {
+   name: "elm/ctxpopup/base/more/default";
+   images {
+      image: "00_popup_bubble_02_bg.png" COMP;
+   }
+   parts {
+      part {
+         name:"frame_shadow_left_top_padding";
+         type:RECT;
+         scale: 1;
+         mouse_events: 0;
+         description {
+            state: "default" 0.0;
+            min: CTXPOPUP_SHADOW_LEFT_PADDING CTXPOPUP_SHADOW_TOP_PADDING;
+            max: CTXPOPUP_SHADOW_LEFT_PADDING CTXPOPUP_SHADOW_TOP_PADDING;
+            rel2 { relative: 0 0; }
+            align: 0 0;
+            fixed: 1 1;
+            visible: 0;
+         }
+      }
+      part {
+         name:"frame_shadow_right_bottom_padding";
+         type:RECT;
+         scale: 1;
+         mouse_events: 0;
+         description {
+            state: "default" 0.0;
+            min: CTXPOPUP_SHADOW_RIGHT_PADDING 0;
+            max: CTXPOPUP_SHADOW_RIGHT_PADDING 0;
+            rel1{relative: 1 1;}
+            align: 1 1;
+            fixed: 1 1;
+            visible: 0;
+         }
+      }
+      part {
+         name: "frame_bg";
+         type: IMAGE;
+         scale: 1;
+         mouse_events: 0;
+         description {
+            state: "default" 0.0;
+            rel1 {to:"frame_shadow_left_top_padding";}
+            rel2 {to:"frame_shadow_right_bottom_padding";}
+            min: CTXPOPUP_MORE_WIDTH_MIN_INC 0;
+            image {
+               normal: "00_popup_bubble_02_bg.png";
+               border: CTXPOPUP_BUBBLE_MORE_BG_IMAGE_BORDER;
+               border_scale: 1;
+            }
+         }
+      }
+      part {
+         name:"content_left_top_padding";
+         type:RECT;
+         scale: 1;
+         mouse_events: 0;
+         description {
+            state: "default" 0.0;
+            min: CTXPOPUP_CONTENT_PADDING_WIDTH CTXPOPUP_CONTENT_PADDING_HEIGHT;
+            max: CTXPOPUP_CONTENT_PADDING_WIDTH CTXPOPUP_CONTENT_PADDING_HEIGHT;
+            rel1 {to:"frame_shadow_left_top_padding";  relative: 1.0 1.0;}
+            align: 0 0;
+            fixed: 1 1;
+            visible: 0;
+         }
+      }
+      part {
+         name:"content_right_bottom_padding";
+         type:RECT;
+         scale: 1;
+         mouse_events: 0;
+         description {
+            state: "default" 0.0;
+            min: CTXPOPUP_CONTENT_PADDING_WIDTH 0;
+            max: CTXPOPUP_CONTENT_PADDING_WIDTH 0;
+            rel2 {to:"frame_shadow_right_bottom_padding";  relative: 0.0 0.0;}
+            align: 1 1;
+            fixed: 1 1;
+            visible: 0;
+         }
+      }
+      part {
+         name: "elm.swallow.content";
+         type: SWALLOW;
+         description {
+            state: "default" 0.0;
+            align: 0 0;
+            rel1 {to:"content_left_top_padding";  relative: 1.0 1.0;}
+            rel2 {to:"content_right_bottom_padding";  relative: 0.0 0.0;}
+         }
+      }
+      part { name: "access.outline";
+         type: RECT;
+         repeat_events: 1;
+         description { state: "default" 0.0;
+            fixed: 1 1;
+            rel1.to: "frame_bg";
+            rel2.to: "frame_bg";
+            color: 0 0 0 0;
+         }
+      }
+   }
+}
 ///////////////////////////////////////////////////////////////////////////////
 group {
    name: "elm/ctxpopup/icon_text_style_item/more/default";