projects / profile / ivi / efl-theme-tizen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 805a52e)
[Nbeat UI Issues: Popup]:
authorShilpa Singh <shilpa.singh@samsung.com>
Wed, 16 Mar 2011 11:35:19 +0000 (17:05 +0530)
committerShilpa Singh <shilpa.singh@samsung.com>
Wed, 16 Mar 2011 11:35:19 +0000 (17:05 +0530)
1. Progressbar dependency issue: minimum size changed for progressbar.
2. Popup: size and scaling issues of action buttons.

Change-Id: If341d442073949c7ffb7abf93c13cc3035fb14c9

themes/groups/popup.edc patch | blob | history
themes/groups/progressbar.edc patch | blob | history

diff --git a/themes/groups/popup.edc b/themes/groups/popup.edc
index 56b8253..4a8381f 100644 (file)
--- a/themes/groups/popup.edc
+++ b/themes/groups/popup.edc
@@ -138,99 +138,6 @@ group { name: "elm/label/base_wrap/popup_description/default";
    }
 }
 
-group { name: "elm/label/base/popup_description/char_wrap_style";
-   styles
-     {
-        style { name: "popup_desc_style_char_wrap";
-           base: "font=SLP:style=Roman font_size=32 align=center color=#000000 wrap=char";
-           tag:  "br" "\n";
-           tag:  "ps" "ps";
-           tag:  "hilight" "+ font=SLP:style=Bold";
-           tag:  "b" "+ font=SLP:style=Bold";
-           tag:  "whitecolor" "+ color=#ffffff";
-           tag:  "tab" "\t";
-        }
-     }
-   parts {
-      part { name: "left_padding";
-         type: RECT;
-         scale: 1;
-         description { state: "default" 0.0;
-            fixed: 1 0;
-            visible: 0;
-            align: 0.0 0.5;
-            min: 10 0;
-            rel1 { 
-               relative: 0.0 0.0; 
-            }
-            rel2 { 
-               relative: 0.0 1.0; 
-            }
-         }
-      }
-      part { name: "elm.text";
-         type: TEXTBLOCK;
-         mouse_events: 0;
-         effect: SHADOW;
-         scale : 1;
-         description { state: "default" 0.0;
-            align: 0.0 0.0;
-            fixed: 1 0;
-            text {
-               style: "popup_desc_style";
-               min: 1 1;
-            }
-            rel1 { 
-               relative: 1.0 0.0; 
-               to: left_padding; 
-            }
-            rel2 { 
-               relative: 1.0 1.0; 
-               to: left_padding; 
-            }
-         }
-      }
-   }
-}
-
-group { name: "elm/label/base_wrap/popup_description/char_wrap_style"; 
-   parts {
-      part { name: "left_padding";
-         type: RECT;
-         scale: 1;
-         description { state: "default" 0.0;
-            fixed: 1 0;
-            visible: 0;
-            align: 0.0 0.5;
-            min: 10 0;
-            rel1 { 
-               relative: 0 0; 
-            }
-            rel2 { 
-               relative: 0 1; 
-            }
-         }
-      }
-      part { name: "elm.text";
-         type: TEXTBLOCK;
-         mouse_events: 0;
-         effect: SHADOW;
-         scale : 1;
-         description { state: "default" 0.0;
-            align: 0.0 0.0;
-            text {
-               style: "popup_desc_style_char_wrap";
-               min: 0 1;
-            }
-            rel1 { 
-               relative: 1.0 0.0; 
-               to: left_padding;
-            }
-         }
-      }
-   }
-}
-
 group { name: "elm/popup/base/default";
    parts {
       images {
@@ -329,7 +236,6 @@ group { name: "elm/popup/base/default";
       part {
          name: "elm.swallow.title";
          type: TEXTBLOCK;
-         effect: SHADOW;
          scale:1;
          description {
             state: "default" 0.0;
@@ -340,7 +246,6 @@ group { name: "elm/popup/base/default";
                  max: 0 1;
               }
             visible:0;
-            color2: 0 0 0 255;
             rel1 { relative: 0.0 0.0; to: "elm.rect.title"; }
             rel2 { relative: 1.0 1.0; to: "elm.rect.title"; }
             align: 0.5 0.5;
@@ -358,7 +263,7 @@ group { name: "elm/popup/base/default";
          type: SWALLOW;
          scale : 1;
          description { state: "default" 0.0;
-            min: 380 0;
+            min: 400 0;
             align: 0.5 0.5;
             fixed: 1 0;
             rel1 {
@@ -366,8 +271,8 @@ group { name: "elm/popup/base/default";
                to: "base";
             }
             rel2 {
-               relative: 0.5 0.0;
-               to: "pad_b_button";
+               relative: 0.5 1.0;
+               to: "base";
             }
          }
          description { state: "show_title" 0.0;
@@ -425,9 +330,7 @@ group { name: "elm/popup/base/default";
          type: SWALLOW;
          scale : 1;
          description { state: "default" 0.0;
-            min: 200 46;
-               fixed : 1 1;
-            align: 0.5 0.5;
+            align: 0.0 0.0;
             visible: 0;
             rel1 {
                relative: 0.0 0.0;
@@ -443,26 +346,6 @@ group { name: "elm/popup/base/default";
             visible: 1;
          }
       }
-      part { name: "pad_b_button";
-         type: RECT;
-         scale : 1;
-         mouse_events: 0;
-         repeat_events: 1;
-         description { state: "default" 0.0;
-            align: 0.5 1.0;
-            min: 0 5;
-            fixed: 0 1;
-            color: 0 0 0 0;
-            rel1 {
-               relative: 0.0 1.0;
-               to: "base";
-            }
-            rel2 {
-               relative: 1.0 1.0;
-               to: "base";
-            }
-         }
-      }
    }
    programs {
       program { name: show_title;
@@ -531,6 +414,7 @@ group { name: "elm/popup/base/default";
       }
    } /* end of programs */
 }
+
 group { name: "elm/popup/content/default";
    parts{
       part { name: "pad_t";
@@ -652,7 +536,7 @@ group { name: "elm/popup/content/liststyle";
             align: 0.5 0.0;
             min: 0 5;
             fixed: 0 1;
-            color: 0 255 0 255;
+            color: 0 0 0 0;
             rel1 {
                relative: 0.0 0.0;
             }
@@ -687,7 +571,7 @@ group { name: "elm/popup/content/customstyle";
          type: SWALLOW;
          scale : 1;
          description { state: "default" 0.0;
-            min: 328 0;
+            min: 400 0;
             align: 0.0 0.0;
             fixed: 1 0;
             rel1 {
@@ -710,7 +594,13 @@ group { name: "elm/popup/buttons1/default";
             min: 252 46;
             max: 252 46;
             fixed : 1 1;
-            align: 0.5 1.0;
+            align: 0.5 0.5;
+            rel1 {
+               relative: 0.5 0.0;
+            }
+            rel2 {
+               relative: 0.5 1.0;
+            }            
          }
       }
    }
@@ -725,7 +615,7 @@ group { name: "elm/popup/buttons2/default";
             min: 172 46;
             max: 172 46;
             fixed : 1 1;
-            align: 1.0 1.0;
+            align: 1.0 0.5;
             rel1 {
                relative: 0.0 0.0;
                to: "elm.rect.pad_btn";
@@ -743,7 +633,7 @@ group { name: "elm/popup/buttons2/default";
             min: 6 46;
             max: 6 46;
             fixed : 1 1;
-            align: 0.5 1.0;
+            align: 0.5 0.5;
             color: 0 0 0 0;
             rel1 {
                relative: 0.5 0.0;
@@ -760,7 +650,7 @@ group { name: "elm/popup/buttons2/default";
             min: 172 46;
             max: 172 46;
             fixed : 1 1;
-            align: 0.0 1.0;
+            align: 0.0 0.5;
             rel1 {
                relative: 1.0 0.0;
                to: "elm.rect.pad_btn";
@@ -784,7 +674,7 @@ group { name: "elm/popup/buttons3/default";
             min: 120 46;
             max: 120 46;
             fixed : 1 1;
-            align: 1.0 1.0;
+            align: 1.0 0.5;
             rel1 {
                relative: 0.0 0.0;
                to: "elm.rect.pad_btn";
@@ -802,7 +692,7 @@ group { name: "elm/popup/buttons3/default";
             min: 6 46;
             max: 6 46;
             fixed : 1 1;
-            align: 0.5 1.0;
+            align: 0.5 0.5;
             color: 0 0 0 0;
             rel1 {
                relative: 0.0 0.0;
@@ -821,7 +711,7 @@ group { name: "elm/popup/buttons3/default";
             min: 120 46;
             max: 120 46;
             fixed : 1 1;
-            align: 0.5 1.0;
+            align: 0.5 0.5;
             rel1 {
                relative: 0.5 0.0;
             }
@@ -837,7 +727,7 @@ group { name: "elm/popup/buttons3/default";
             min: 6 46;
             max: 6 46;
             fixed : 1 1;
-            align: 0.5 1.0;
+            align: 0.5 0.5;
             color: 0 0 0 0;
             rel1 {
                relative: 1.0 0.0;
@@ -856,7 +746,7 @@ group { name: "elm/popup/buttons3/default";
             min: 120 46;
             max: 120 46;
             fixed : 1 1;
-            align: 0.0 1.0;
+            align: 0.0 0.5;
             rel1 {
                relative: 1.0 0.0;
                to: "elm.rect.pad_btn2";
diff --git a/themes/groups/progressbar.edc b/themes/groups/progressbar.edc
index 6bec192..a3c355e 100644 (file)
--- a/themes/groups/progressbar.edc
+++ b/themes/groups/progressbar.edc
@@ -2112,7 +2112,7 @@
             scale: 1;
             type: SWALLOW;
             description {
-               min: 406 14;
+               min: 300 14;
                max: 99999 14;
                state: "default" 0.0;
                rel1 {
Domain: UI Framework / EFL;