[popup] UX 5.1 implementation.

Change-Id: I425eaaf92f6b24b2a6517a34f84a641f6d444301

diff --git a/themes/images/tizen-hd/Popup/00_popup_dim_lighting.png b/themes/images/tizen-hd/Popup/00_popup_dim_lighting.png
index 31bee56..51ee8e3 100644 (file)
Binary files a/themes/images/tizen-hd/Popup/00_popup_dim_lighting.png and b/themes/images/tizen-hd/Popup/00_popup_dim_lighting.png differ

diff --git a/themes/images/tizen-hd/Popup/00_popup_dim_lighting_h.png b/themes/images/tizen-hd/Popup/00_popup_dim_lighting_h.png
new file mode 100644 (file)
index 0000000..d489652
Binary files /dev/null and b/themes/images/tizen-hd/Popup/00_popup_dim_lighting_h.png differ

diff --git a/themes/inc/tizen-hd-inc.edc b/themes/inc/tizen-hd-inc.edc
index 45cde24..156c547 100644 (file)
--- a/themes/inc/tizen-hd-inc.edc
+++ b/themes/inc/tizen-hd-inc.edc
@@ -827,8 +827,8 @@
 #define POPUP_DESCRIPTION_DEFAULT_TEXT_MIN_INC 648 300
 
 #define POPUP_ITEM_BG_DEFAULT_MIN_INC 648 112
-#define POPUP_ITEM_LEFT_MIN_PADDING_INC 8 0
-#define POPUP_ITEM_RIGHT_MIN_PADDING_INC 8 0
+#define POPUP_ITEM_LEFT_MIN_PADDING_INC 5 0
+#define POPUP_ITEM_RIGHT_MIN_PADDING_INC 5 0
 #define POPUP_ITEM_ICON_TEXT_PADDING_INC 16 0
 #define POPUP_ITEM_TEXT_DISABLED_COLOR_INC 128 128 128 255
 #define POPUP_ITEM_TEXT_DISABLED_VISIBLE_COLOR_INC 128 128 128 255
@@ -854,8 +854,8 @@
 #define POPUP_BASE_DEFAULT_BASE_LANDSCAPE_MIN_INC 900 0
 #define POPUP_BASE_DEFAULT_BASE_LANDSCAPE_MAX_INC 900 720
 #define POPUP_BASE_DEFAULT_BG_DEFAULT_IMAGE_BORDER_INC 26 26 32 47
-#define POPUP_BASE_DEFAULT_TITLE_DEFAULT_MIN_INC 630 80
-#define POPUP_BASE_DEFAULT_TITLE_LANDSCAPE_MIN_INC 810 80
+#define POPUP_BASE_DEFAULT_TITLE_DEFAULT_MIN_INC 636 78
+#define POPUP_BASE_DEFAULT_TITLE_LANDSCAPE_MIN_INC 816 78
 #define POPUP_BASE_DEFAULT_TITLE_VOLUMEBAR_MIN_INC 648 68
 #define POPUP_BASE_DEFAULT_PADDING_MIN_MAX_INC 30 10
 #define POPUP_BASE_DEFAULT_TITLE_ICON_DEFAULT_MIN_MAX_INC 64 64
@@ -870,19 +870,19 @@
 #define POPUP_LABEL_DESC_TOP_PADDING 32
 #define POPUP_LABEL_DESC_BOTTOM_PADDING 32
 #define POPUP_ACTION_DESC_TOP_PADDING 20
-#define POPUP_TITLE_TOP_PADDING 18
+#define POPUP_TITLE_TOP_PADDING 20
 #define POPUP_TITLE_BOTTOM_PADDING 0
 #define POPUP_TITLE_ICON_TEXT_PADDING_INC 16 0
 
-#define POPUP_CONTENT_DEFAULT_PADDING_TOP_MIN_INC 20
-#define POPUP_CONTENT_DEFAULT_PADDING_LEFT_MIN_INC 45
-#define POPUP_CONTENT_DEFAULT_PADDING_RIGHT_MIN_INC 45
-#define POPUP_CONTENT_DEFAULT_PADDING_BOTTOM_MIN_INC 20
+#define POPUP_CONTENT_DEFAULT_PADDING_TOP_MIN_INC 32
+#define POPUP_CONTENT_DEFAULT_PADDING_LEFT_MIN_INC 42
+#define POPUP_CONTENT_DEFAULT_PADDING_RIGHT_MIN_INC 42
+#define POPUP_CONTENT_DEFAULT_PADDING_BOTTOM_MIN_INC 32
 #define POPUP_CONTENT_DEFAULT_CONTENT_DEFAULT_MIN_INC 630 0
 #define POPUP_CONTENT_DEFAULT_CONTENT_LANDSCAPE_MIN_INC 810 0
 
 #define POPUP_BASE_CONTENT_EXPAND_BG_DEFAULT_MIN_INC 0 114
-#define POPUP_BASE_CONTENT_EXPAND_TITLE_DEFAULT_MIN_INC 0 80
+#define POPUP_BASE_CONTENT_EXPAND_TITLE_DEFAULT_MIN_INC 0 78
 
 #define POPUP_BASE_VERTICAL_BUTTON_BUTTONAREA_DEFAULT_MIN_INC 648 294
 

diff --git a/themes/widgets/popup.edc b/themes/widgets/popup.edc
index 833252d..570343e 100644 (file)
--- a/themes/widgets/popup.edc
+++ b/themes/widgets/popup.edc
@@ -216,6 +216,7 @@ group { name: "elm/notify/block_events/popup";
    alias: "elm/notify/block_events/content_no_vhpad";
    images {
       image: "00_popup_dim_lighting.png" COMP;
+      image: "00_popup_dim_lighting_h.png" COMP;
    }
    parts {
       part { name: "block_events";
@@ -226,11 +227,9 @@ group { name: "elm/notify/block_events/popup";
             image.normal: "00_popup_dim_lighting.png";
             fill.smooth: 0;
          }
-         description { state: "show" 0.0;
-            inherit: "default" 0.0;
-         }
-         description { state: "clicked" 0.0;
-            inherit: "default" 0.0;
+         description { state: "landscape" 0.0;
+            image.normal: "00_popup_dim_lighting_h.png";
+            fill.smooth: 0;
          }
       }
       part {name: "popup_indicator";
@@ -275,18 +274,17 @@ group { name: "elm/notify/block_events/popup";
    }
    programs {
       program { name: "show";
-          signal: "elm,action,show";
-          source: "elm";
-          action: STATE_SET "default" 0.0;
-          target: "block_events";
-          target: "block_events_color";
-          target: "popup_indicator";
+         signal: "elm,action,show";
+         source: "elm";
+         action: STATE_SET "default" 0.0;
+         target: "block_events";
+         target: "block_events_color";
+         target: "popup_indicator";
        }
       program { name: "show1";
          signal: "show";
          action: STATE_SET "show" 0.0;
          transition: SIN_FAC 0.33 0.5;
-         target: "block_events";
          target: "block_events_color";
          target: "popup_indicator";
       }
@@ -305,7 +303,6 @@ group { name: "elm/notify/block_events/popup";
       program {
          name: "deeper_block_color";
          action: STATE_SET "clicked" 0.0;
-         target: "block_events";
          target: "block_events_color";
          target: "popup_indicator";
          transition: LINEAR 0.2;
@@ -314,11 +311,34 @@ group { name: "elm/notify/block_events/popup";
       program {
          name: "default_block_color";
          action: STATE_SET "show" 0.0;
-         target: "block_events";
          target: "block_events_color";
          target: "popup_indicator";
          transition: LINEAR 0.2;
       }
+      program { name: "landscape_mode";
+         source: "elm";
+         signal: "elm,state,orient,90";
+         action: STATE_SET "landscape" 0.0;
+         target: "block_events";
+      }
+      program { name: "landscape_mode2";
+         source: "elm";
+         signal: "elm,state,orient,270";
+         action: STATE_SET "landscape" 0.0;
+         target: "block_events";
+      }
+      program { name: "portrait_mode";
+         source: "elm";
+         signal: "elm,state,orient,0";
+         action: STATE_SET "default" 0.0;
+         target: "block_events";
+      }
+      program { name: "portrait_mode2";
+         source: "elm";
+         signal: "elm,state,orient,180";
+         action: STATE_SET "default" 0.0;
+         target: "block_events";
+      }
    }
 }
 
@@ -526,8 +546,8 @@ group { name: "elm/popup/base/default";
          type: SPACER;
          scale: 1;
          description { state: "default" 0.0;
-            min: 0 (POPUP_LABEL_DESC_TOP_PADDING-POPUP_CONTENT_DEFAULT_PADDING_TOP_MIN_INC);
-            max: 0 (POPUP_LABEL_DESC_TOP_PADDING-POPUP_CONTENT_DEFAULT_PADDING_TOP_MIN_INC);
+            min: 0 0;
+            max: 0 0;
             fixed: 1 1;
             align: 0.5 0.0;
             rel1 {
@@ -544,8 +564,8 @@ group { name: "elm/popup/base/default";
          type: SPACER;
          scale: 1;
          description { state: "default" 0.0;
-            min: 0 (POPUP_LABEL_DESC_BOTTOM_PADDING-POPUP_CONTENT_DEFAULT_PADDING_BOTTOM_MIN_INC);
-            max: 0 (POPUP_LABEL_DESC_BOTTOM_PADDING-POPUP_CONTENT_DEFAULT_PADDING_BOTTOM_MIN_INC);
+            min: 0 0;
+            max: 0 0;
             fixed: 1 1;
             align: 0.5 1.0;
             rel1 {
@@ -1040,6 +1060,25 @@ group { name: "elm/popup/content/content_no_vhpad";
    inherit: "elm/popup/content/default";
    alias: "elm/popup/content/min_menustyle";
    parts {
+      part { name: "pad_t";
+         type: SPACER;
+         scale: 1;
+         mouse_events: 0;
+         description { state: "default" 0.0;
+            align: 0.5 0.0;
+            min: 0 POPUP_ACTION_DESC_TOP_PADDING;
+            max: 0 POPUP_ACTION_DESC_TOP_PADDING;
+            fixed: 0 1;
+            rel1 {
+               relative: 1.0 0.0;
+               to_x: "pad_l";
+            }
+            rel2 {
+               relative: 0.0 0.0;
+               to_x: "pad_r";
+            }
+         }
+      }
       part { name: "pad_l";
          type: SPACER;
          scale: 1;
@@ -1062,6 +1101,21 @@ group { name: "elm/popup/content/content_no_vhpad";
             align: 1.0 0.0;
          }
       }
+      part { name: "pad_b";
+         type: SPACER;
+         scale: 1;
+         description { state: "default" 0.0;
+            align: 0.5 1.0;
+            min: 0 POPUP_ACTION_DESC_TOP_PADDING;
+            max: 0 POPUP_ACTION_DESC_TOP_PADDING;
+            fixed: 0 1;
+            rel1 {
+               relative: 0.0 1.0;
+               to_x: "pad_l";
+            }
+            rel2.to_x: "pad_r";
+         }
+      }
    }
 }