rimmed pushed a commit to branch master.

http://git.enlightenment.org/tools/eflete.git/commit/?id=be95edd27ce7cca8e8b471f3b6b6edf772684db8

commit be95edd27ce7cca8e8b471f3b6b6edf772684db8
Author: Vyacheslav Reutskiy <v.reuts...@samsung.com>
Date:   Fri Feb 12 17:07:27 2016 +0200

    popup.edc: update default style accordingly to guideline
    
    This commit update the popup style, but not fully.
    Not implemented states for hide title and action area,
    because Eflete not used it now.
    
    TODO: implement the popup state without title and
    action_area.
    
    Change-Id: I5f60168e7abb795271b9571c2be44d92ab636df6
---
 data/themes/default/widgets/popup.edc | 329 ++++++++++------------------------
 1 file changed, 96 insertions(+), 233 deletions(-)

diff --git a/data/themes/default/widgets/popup.edc 
b/data/themes/default/widgets/popup.edc
index 001ed91..a353706 100644
--- a/data/themes/default/widgets/popup.edc
+++ b/data/themes/default/widgets/popup.edc
@@ -53,7 +53,6 @@ group { name: "elm/notify/center/popup/default";
          }
       }
       part { name: "pop";
-         mouse_events: 1;
          description { state: "default" 0.0;
             image {
                normal: "popup-bg.png";
@@ -61,11 +60,9 @@ group { name: "elm/notify/center/popup/default";
             }
             rel1 {
                to: "base";
-               offset: -5 -5;
             }
             rel2 {
                to: "base";
-               offset: 4 4;
             }
          }
       }
@@ -74,11 +71,11 @@ group { name: "elm/notify/center/popup/default";
          description { state: "default" 0.0;
             rel1 {
                to: "pop";
-               offset: 21 21;
+               offset: 27 21;
             }
             rel2 {
                to: "pop";
-               offset: -21 -21;
+               offset: -28 -22;
             }
          }
       }
@@ -93,9 +90,9 @@ group { name: "elm/label/base/popup/default";
          scale: 1;
          description { state: "default" 0.0;
             text {
-               style: "eflete_textblock_style";
-               min: 0 1;
-               max: 0 1;
+               style: "main_text";
+               //min: 0 1;
+               //max: 0 1;
             }
          }
       }
@@ -104,7 +101,6 @@ group { name: "elm/label/base/popup/default";
 
 group { name: "elm/popup/base/default";
    images{
-         image:"popup-header-bg.png" COMP;
          image:"separator-horizontal.png" COMP;
    }
    parts {
@@ -112,190 +108,84 @@ group { name: "elm/popup/base/default";
          type: SPACER;
          scale: 1;
          description { state: "default" 0.0;
-            min: 400 0;
             align: 0.0 0.0;
+            min: 400 0;
          }
       }
-      part { name: "elm.bg.title";
-         type: IMAGE;
-         scale: 1;
+      part { name: "elm.text.title";
+         type: TEXT;
          description { state: "default" 0.0;
-            min: 400 30;
-            max: 400 30;
-            fixed: 1 1;
             align: 0.5 0.0;
-            visible: 0;
-            image {
-               normal: "popup-header-bg.png";
-               border: 11 11 0 0;
-            }
+            min: 0 34;
+            max: -1 34;
+            color_class: "main";
             rel1 {
-               relative: 0.5 0.0;
                to: "base";
             }
             rel2 {
-               relative: 0.5 0.0;
                to: "base";
             }
-         }
-         description { state: "visible" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
-      }
-      part { name: "left_pad";
-         type: SPACER;
-         scale: 1;
-         description { state: "default" 0.0;
-            min: 10 0;
-            max: 10 0;
-            fixed: 1 1;
-            align: 0.0 0.0;
-            rel1.to: "elm.bg.title";
-         }
-      }
-      part { name: "right_pad";
-         type: SPACER;
-         scale: 1;
-         description { state: "default" 0.0;
-            min: 10 0;
-            max: 10 0;
-            fixed: 1 1;
-            align: 1.0 1.0;
-            rel2.to: "elm.bg.title";
-         }
-      }
-      part { name: "elm.swallow.title.icon";
-         type: SWALLOW;
-         scale: 1;
-         description { state: "default" 0.0;
-            min: 24 24;
-            max: 24 24;
-            fixed: 1 1;
-            align: 0.0 0.5;
-            visible: 0;
-            rel1 {
-               to: "left_pad";
-               relative: 1.0 0.0;
-            }
-            rel2 {
-               to: "right_pad";
-               relative: 0.0 1.0;
+            text {
+               font: "PT:style=Bold";
+               size: 13;
             }
          }
-         description { state: "visible" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
       }
-      part { name: "elm.text.title";
-         type: TEXTBLOCK;
-         scale: 1;
+      part { name: "separator.title";
+         type: IMAGE;
          description { state: "default" 0.0;
-            fixed: 1 1;
-            text {
-              style: "popup_title_style";
-              min: 0 1;
-            }
-            color: 255 255 255 255;
-            visible: 0;
+            align: 0.5 0.0;
+            max: -1 2;
             rel1 {
-               relative: 1.0 0.0;
-               to: "left_pad";
-            }
-            rel2 {
                relative: 0.0 1.0;
-               to: "right_pad";
+               to_y: "elm.text.title";
+            }
+            image {
+               normal: "separator-horizontal.png";
             }
-         }
-         description { state: "visible" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
          }
       }
       part { name: "elm.swallow.content";
          type: SWALLOW;
          scale: 1;
          description { state: "default" 0.0;
-            min: 0 70;
             fixed: 1 0;
+            min: 0 70;
             rel1 {
-               to: "elm.bg.title";
                relative: 0.0 1.0;
+               to_y: "separator.title";
             }
             rel2 {
-               to: "elm.bg.action_area.separator";
-               relative: 1.0 1.0;
+               relative: 1.0 0.0;
+               to_y: "separator.action_area";
             }
          }
       }
-      part { name: "elm.bg.action_area.separator";
+      part { name: "separator.action_area";
          type: IMAGE;
-         scale: 1;
          description { state: "default" 0.0;
-            min: 200 2;
+            align: 0.5 1.0;
             max: -1 2;
-            align: 0.5 0.0;
-            visible: 0;
-            image.normal: "separator-horizontal.png";
-            rel1 {
-               to_x: "elm.bg.title";
-               to_y: "elm.bg.action_area";
-            }
             rel2 {
-               to_x: "elm.bg.title";
-               to_y: "elm.bg.action_area";
-               offset: -2 0;
+               relative: 1.0 0.0;
+               to_y: "elm.swallow.action_area";
             }
-         }
-         description { state: "visible" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
-      }
-      part { name: "elm.bg.action_area";
-         type: RECT;
-         scale: 1;
-         description { state: "default" 0.0;
-            min: 400 41;
-            fixed: 1 1;
-            align: 0.5 1.0;
-            visible: 0;
-            color: 0 0 0 0;
-            rel1 {
-               relative: 0.0 1.0;
-               to: "base";
+            image {
+               normal: "separator-horizontal.png";
             }
-            rel2.to: "base";
-         }
-         description { state: "visible" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
          }
       }
       part { name: "elm.swallow.action_area";
          type: SWALLOW;
          scale: 1;
          description { state: "default" 0.0;
-            align: 0.0 0.0;
-            rel1.to: "elm.bg.action_area";
-            rel2.to: "elm.bg.action_area";
+            align: 0.5 1.0;
+            min: 0 34;
+            max: -1 34;
          }
       }
    }
    programs {
-      program { name: show_title_icon;
-         signal: "elm,state,title,icon,visible";
-         source: "elm";
-         action: STATE_SET "visible" 0.0;
-         target: "elm.swallow.title.icon";
-      }
-      program { name: hide_title_icon;
-         signal: "elm,state,title,icon,hidden";
-         source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "elm.swallow.title.icon";
-      }
       program { name: show_title_text;
          signal: "elm,state,title,text,visible";
          source: "elm";
@@ -308,6 +198,7 @@ group { name: "elm/popup/base/default";
          action: STATE_SET "default" 0.0;
          target: "elm.text.title";
       }
+      /*
       program { name: show_title_area;
          signal: "elm,state,title_area,visible";
          source: "elm";
@@ -319,7 +210,7 @@ group { name: "elm/popup/base/default";
               set_state(PART:"elm.swallow.content", "show_action_title_area", 
0.0);
             else
               set_state(PART:"elm.swallow.content", "show_title_area", 0.0);
-            set_state(PART:"elm.bg.title", "visible", 0.0);
+            set_state(PART:"elm.text.title", "visible", 0.0);
          }
       }
       program { name: hide_title_area;
@@ -334,7 +225,7 @@ group { name: "elm/popup/base/default";
               set_state(PART:"elm.swallow.content", "show_action_area", 0.0);
             else
               set_state(PART:"elm.swallow.content", "default", 0.0);
-            set_state(PART:"elm.bg.title", "default", 0.0);
+            set_state(PART:"elm.text.title", "default", 0.0);
          }
       }
       program { name: show_action_area;
@@ -343,7 +234,7 @@ group { name: "elm/popup/base/default";
          script {
             new st[31];
             new Float:vl;
-            get_state(PART:"elm.bg.title", st, 30, vl);
+            get_state(PART:"elm.text.title", st, 30, vl);
             if (!strcmp(st, "visible"))
               set_state(PART:"elm.swallow.content", "show_action_title_area", 
0.0);
             else
@@ -359,7 +250,7 @@ group { name: "elm/popup/base/default";
          script {
             new st[31];
             new Float:vl;
-            get_state(PART:"elm.bg.title", st, 30, vl);
+            get_state(PART:"elm.text.title", st, 30, vl);
             if (!strcmp(st, "visible"))
               set_state(PART:"elm.swallow.content", "show_title_area", 0.0);
             else
@@ -367,7 +258,7 @@ group { name: "elm/popup/base/default";
             set_state(PART:"elm.bg.action_area", "default", 0.0);
             set_state(PART:"elm.bg.action_area.separator", "default", 0.0);
          }
-      }
+      } */
    } /* end of programs */
 }
 
@@ -707,139 +598,111 @@ group { name: "elm/popup/item/popup/default";
 }
 
 group { name: "elm/popup/buttons1/popup/default";
-   data.item: "action_area_height" "140";
    parts{
-      part{ name:"elm.swallow.content.button1";
+      part { name: "elm.swallow.content.button1";
          type: SWALLOW;
          scale: 1;
          description { state: "default" 0.0;
-            min: 120 27;
-            max: 120 27;
-            fixed: 1 1;
-            rel1.relative: 0.5 0.0;
-            rel2.relative: 0.5 1.0;
+            align: 1.0 0.5;
+            rel1 {
+               relative: 1.0 0.5;
+               offset: -12 0;
+            }
+            rel2 {
+               relative: 1.0 0.5;
+               offset: -13 -1;
+            }
          }
       }
    }
 }
 
 group { name: "elm/popup/buttons2/popup/default";
-   data.item: "action_area_height" "140";
-   parts{
-      part{ name:"elm.swallow.content.button1";
+   parts {
+      part { name: "elm.swallow.content.button1";
          type: SWALLOW;
          scale: 1;
          description { state: "default" 0.0;
-            min: 120 27;
-            max: 120 27;
-            fixed: 1 1;
             align: 1.0 0.5;
-            rel1.to: "elm.rect.pad_btn";
+            rel1 {
+               relative: 0.0 0.5;
+               offset: -12 0;
+               to_x: "elm.swallow.content.button2";
+            }
             rel2 {
-               relative: 0.0 1.0;
-               to: "elm.rect.pad_btn";
+               relative: 0.0 0.5;
+               offset: -13 -1;
+               to_x: "elm.swallow.content.button2";
             }
          }
       }
-      part { name: "elm.rect.pad_btn";
-         type: SPACER;
-         scale: 1;
-         description { state: "default" 0.0;
-            min: 6 27;
-            max: 6 27;
-            fixed: 1 1;
-            rel1.relative: 0.5 0.0;
-            rel2.relative: 0.5 1.0;
-         }
-      }
-      part{ name:"elm.swallow.content.button2";
+      part { name: "elm.swallow.content.button2";
          type: SWALLOW;
          scale: 1;
          description { state: "default" 0.0;
-            min: 120 27;
-            max: 120 27;
-            fixed: 1 1;
-            align: 0.0 0.5;
+            align: 1.0 0.5;
             rel1 {
-               relative: 1.0 0.0;
-               to: "elm.rect.pad_btn";
+               relative: 1.0 0.5;
+               offset: -12 0;
+            }
+            rel2 {
+               relative: 1.0 0.5;
+               offset: -13 -1;
             }
-            rel2.to: "elm.rect.pad_btn";
          }
       }
    }
 }
 
 group { name: "elm/popup/buttons3/popup/default";
-   data.item: "action_area_height" "140";
-   parts{
-      part{ name:"elm.swallow.content.button1";
+   parts {
+      part { name: "elm.swallow.content.button1";
          type: SWALLOW;
          scale: 1;
          description { state: "default" 0.0;
-            min: 120 27;
-            max: 120 27;
-            fixed: 1 1;
             align: 1.0 0.5;
-            rel1.to: "elm.rect.pad_btn";
-            rel2 {
-               relative: 0.0 1.0;
-               to: "elm.rect.pad_btn";
+            rel1 {
+               relative: 0.0 0.5;
+               offset: -12 0;
+               to_x: "elm.swallow.content.button2";
             }
-         }
-      }
-      part { name: "elm.rect.pad_btn";
-         type: SPACER;
-         scale: 1;
-         description { state: "default" 0.0;
-            min: 6 27;
-            max: 6 27;
-            fixed: 1 1;
-            rel1.to: "elm.swallow.content.button2";
             rel2 {
-               relative: 0.0 1.0;
-               to: "elm.swallow.content.button2";
+               relative: 0.0 0.5;
+               offset: -13 -1;
+               to_x: "elm.swallow.content.button2";
             }
          }
       }
-      part{ name:"elm.swallow.content.button2";
+      part { name: "elm.swallow.content.button2";
          type: SWALLOW;
          scale: 1;
          description { state: "default" 0.0;
-            min: 120 27;
-            max: 120 27;
-            fixed: 1 1;
-            rel1.relative: 0.5 0.0;
-            rel2.relative: 0.5 1.0;
-         }
-      }
-      part { name: "elm.rect.pad_btn2";
-         type: SPACER;
-         scale: 1;
-         description { state: "default" 0.0;
-            min: 6 27;
-            max: 6 27;
-            fixed: 1 1;
+            align: 1.0 0.5;
             rel1 {
-               relative: 1.0 0.0;
-               to: "elm.swallow.content.button2";
+               relative: 0.0 0.5;
+               offset: -12 0;
+               to_x: "elm.swallow.content.button3";
+            }
+            rel2 {
+               relative: 0.0 0.5;
+               offset: -13 -1;
+               to_x: "elm.swallow.content.button3";
             }
-            rel2.to: "elm.swallow.content.button2";
          }
       }
-      part{ name:"elm.swallow.content.button3";
+      part { name: "elm.swallow.content.button3";
          type: SWALLOW;
          scale: 1;
          description { state: "default" 0.0;
-            min: 120 27;
-            max: 120 27;
-            fixed: 1 1;
-            align: 0.0 0.5;
+            align: 1.0 0.5;
             rel1 {
-               relative: 1.0 0.0;
-               to: "elm.rect.pad_btn2";
+               relative: 1.0 0.5;
+               offset: -12 0;
+            }
+            rel2 {
+               relative: 1.0 0.5;
+               offset: -13 -1;
             }
-            rel2.to: "elm.rect.pad_btn2";
          }
       }
    }

-- 


Reply via email to