projects / platform / core / uifw / efl-theme-tizen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a5396a1)
[conformant] Set content bottom based on the signal from conform object
authorjae_hyun.cho <jae_hyun.cho@samsung.com>
Fri, 15 Mar 2013 06:39:30 +0000 (15:39 +0900)
committerSungho Kwak <sungho1.kwak@samsung.com>
Mon, 25 Mar 2013 06:24:40 +0000 (15:24 +0900)
Change-Id: I012d8898df0d87b62b7bf5ed182caf41df51ca0e

themes/widgets/conformant.edc patch | blob | history

diff --git a/themes/widgets/conformant.edc b/themes/widgets/conformant.edc
index ff97a48..1eb13bf 100644 (file)
--- a/themes/widgets/conformant.edc
+++ b/themes/widgets/conformant.edc
@@ -25,9 +25,6 @@
         public indicator_overlap = 0;     //check indicator overlap/nooverlap
         public clipboard_disable  = 0;     //check clipboard enable/disable
         public keypad_disable = 0;  //check virtualkeypad enable/disable
-        public landscape = 0; //Landscape mode status
-        public portrait_overlap = 0; //save portrait_overlap mode
-        public portrait_opacity = 0; //save portrait_opacity
      }
      parts {
         part { name: "elm.swallow.bg";
@@ -39,34 +36,24 @@
         part { name: "elm.swallow.content";
            type: SWALLOW;
            scale: 1;
-           description { state: "default" 0.0; //indi:nooverlap, clipboard: enable, keypad: enable/disable
+           description { state: "default" 0.0; //indi: nooverlap, sip: enable
               align: 0.5 0.5;
               rel1.relative: 0.0 1.0;
               rel1.to: "elm.swallow.indicator";
               rel2.relative: 1.0 0.0;
-              rel2.to: "elm.swallow.clipboard";
+              rel2.to: "sip_area";
            }
-           description { state: "nooverlap_disable_clipboard_enable_keypad" 0.0; //indi:nooverlap, clipboard: disable, keypad: enable
-              inherit: "default" 0.0;
-              rel2.to: "elm.swallow.virtualkeypad";
-           }
-           description { state: "nooverlap_disable_clipboard_disable_keypad" 0.0; //indi:nooverlap, clipboard: disable, keypad: disable
+           description { state: "nooverlap_disable_sip" 0.0; //indi: nooverlap, sip: disable
               inherit: "default" 0.0;
               rel2.relative: 1.0 1.0;
               rel2.to: "elm.swallow.bg";
            }
-           description { state: "overlap_enable_clipboard" 0.0; //indi:overlap, clipboard: enable, keypad: enable/disable
-              inherit: "default" 0.0;
-              rel1.relative: 0.0 0.0;
-              rel1.to: "elm.swallow.indicator";
-           }
-           description { state: "overlap_disable_clipboard_enable_keypad" 0.0; //indi:overlap, clipboard: disable, keypad: enable
+           description { state: "overlap" 0.0; //indi: overlap, sip: enable
               inherit: "default" 0.0;
               rel1.relative: 0.0 0.0;
               rel1.to: "elm.swallow.indicator";
-              rel2.to: "elm.swallow.virtualkeypad";
            }
-           description { state: "overlap_disable_clipboard_disable_keypad" 0.0; //indi:overlap, clipboard: disable, keypad: enable
+           description { state: "overlap_disable_sip" 0.0; //indi: overlap, sip: disable
               inherit: "default" 0.0;
               rel1.relative: 0.0 0.0;
               rel1.to: "elm.swallow.indicator";
@@ -82,7 +69,7 @@
               rel1.relative: 0.0 1.0;
               rel1.to: "elm.swallow.indicator";
               rel2.relative: 1.0 0.0;
-              rel2.to: "elm.swallow.clipboard";
+              rel2.to: "sip_area";
            }
            description { state: "overlap" 0.0;
               inherit: "default" 0.0;
@@ -90,7 +77,7 @@
               rel1.relative: 0.0 0.0;
               rel1.to: "elm.swallow.indicator";
               rel2.relative: 1.0 0.0;
-              rel2.to: "elm.swallow.clipboard";
+              rel2.to: "sip_area";
            }
         }
         part { name: "indicator_bg";
@@ -156,22 +143,29 @@
               visible: 1;
            }
         }
-        part { name: "elm.swallow.clipboard";
-           type: SWALLOW;
+        part { name: "sip_area";
+           type: RECT;
            description { state: "default" 0.0;
               fixed: 0 1;
-              align: 0.0 1.0;
+              min: 0 0;
               rel1.relative: 0.0 0.0;
               rel1.to_y: "elm.swallow.virtualkeypad";
-              rel2.relative: 1.0 0.0;
+              rel2.relative: 1.0 1.0;
               rel2.to_y: "elm.swallow.virtualkeypad";
+              visible: 0;
            }
-           description { state: "disable_keypad" 0.0;
+           description { state: "clipboard_on" 0.0;
               inherit: "default" 0.0;
+              rel1.to_y: "elm.swallow.clipboard";
+              rel2.to_y: "elm.swallow.clipboard";
+           }
+        }
+        part { name: "elm.swallow.clipboard";
+           type: SWALLOW;
+           description { state: "default" 0.0;
+              fixed: 0 1;
+              align: 0.0 1.0;
               rel1.relative: 0.0 1.0;
-              rel1.to_y: "elm.swallow.bg";
-              rel2.relative: 1.0 1.0;
-              rel2.to_y: "elm.swallow.bg";
            }
         }
         part { name: "elm.swallow.virtualkeypad";
@@ -246,15 +240,10 @@
            script {
               set_int(indicator_overlap, 1);
               set_state(PART:"elm.swallow.ug", "overlap", 0.0);
-              if (get_int(clipboard_disable) == 0)
-                set_state(PART:"elm.swallow.content", "overlap_enable_clipboard", 0.0);
+              if ((get_int(keypad_disable) == 1) && (get_int(clipboard_disable) == 1))
+                set_state(PART:"elm.swallow.content", "overlap_disable_sip", 0.0);
               else
-                {
-                   if (get_int(keypad_disable) == 0)
-                     set_state(PART:"elm.swallow.content", "overlap_disable_clipboard_enable_keypad", 0.0);
-                   else
-                     set_state(PART:"elm.swallow.content", "overlap_disable_clipboard_disable_keypad", 0.0);
-                }
+                set_state(PART:"elm.swallow.content", "overlap", 0.0);
           }
         }
         program {
@@ -264,15 +253,10 @@
            script {
               set_int(indicator_overlap, 0);
               set_state(PART:"elm.swallow.ug", "default", 0.0);
-              if (get_int(clipboard_disable) == 0)
-                set_state(PART:"elm.swallow.content", "default", 0.0);
+              if ((get_int(keypad_disable) == 1) && (get_int(clipboard_disable) == 1))
+                set_state(PART:"elm.swallow.content", "nooverlap_disable_sip", 0.0);
               else
-                {
-                   if (get_int(keypad_disable) == 0)
-                     set_state(PART:"elm.swallow.content", "nooverlap_disable_clipboard_enable_keypad", 0.0);
-                   else
-                     set_state(PART:"elm.swallow.content", "nooverlap_disable_clipboard_disable_keypad", 0.0);
-                }
+                set_state(PART:"elm.swallow.content", "default", 0.0);
            }
         }
         program { name: "enable_clipboard";
@@ -284,12 +268,7 @@
               if (get_int(indicator_overlap) == 0)
                 set_state(PART:"elm.swallow.content", "default", 0.0);
               else
-                set_state(PART:"elm.swallow.content", "overlap_enable_clipboard", 0.0);
-              //set clipboard state
-              if (get_int(keypad_disable) == 1)
-                set_state(PART:"elm.swallow.clipboard", "disable_keypad", 0.0);
-              else
-                set_state(PART:"elm.swallow.clipboard", "default", 0.0);
+                set_state(PART:"elm.swallow.content", "overlap", 0.0);
            }
         }
         program { name: "disable_clipboard";
@@ -297,20 +276,20 @@
            source: "";
            script {
               set_int(clipboard_disable, 1);
-              set_state(PART:"elm.swallow.clipboard", "default", 0.0);
+              set_state(PART:"sip_area", "default", 0.0);
               if (get_int(indicator_overlap) == 0)
                 {
                    if (get_int(keypad_disable) == 1)
-                     set_state(PART:"elm.swallow.content", "nooverlap_disable_clipboard_disable_keypad", 0.0);
+                     set_state(PART:"elm.swallow.content", "nooverlap_disable_sip", 0.0);
                    else
-                     set_state(PART:"elm.swallow.content", "nooverlap_disable_clipboard_enable_keypad", 0.0);
+                     set_state(PART:"elm.swallow.content", "default", 0.0);
                 }
               else
                 {
                    if (get_int(keypad_disable) == 1)
-                     set_state(PART:"elm.swallow.content", "overlap_disable_clipboard_disable_keypad", 0.0);
+                     set_state(PART:"elm.swallow.content", "overlap_disable_sip", 0.0);
                    else
-                     set_state(PART:"elm.swallow.content", "overlap_disable_clipboard_enable_keypad", 0.0);
+                     set_state(PART:"elm.swallow.content", "overlap", 0.0);
                 }
            }
         }
@@ -319,21 +298,10 @@
            source: "";
            script {
               set_int(keypad_disable, 0);
-              set_state(PART:"elm.swallow.clipboard", "default", 0.0);
-              if (get_int(clipboard_disable) == 1)
-                {
-                   if (get_int(indicator_overlap) == 0)
-                     set_state(PART:"elm.swallow.content", "nooverlap_disable_clipboard_enable_keypad", 0.0);
-                   else
-                     set_state(PART:"elm.swallow.content", "overlap_disable_clipboard_enable_keypad", 0.0);
-                }
+              if (get_int(indicator_overlap) == 0)
+                set_state(PART:"elm.swallow.content", "default", 0.0);
               else
-                {
-                   if (get_int(indicator_overlap) == 0)
-                     set_state(PART:"elm.swallow.content", "default", 0.0);
-                   else
-                     set_state(PART:"elm.swallow.content", "overlap_enable_clipboard", 0.0);
-                }
+                set_state(PART:"elm.swallow.content", "overlap", 0.0);
            }
         }
         program { name: "disable_virtualkeypad";
@@ -343,92 +311,47 @@
               set_int(keypad_disable, 1);
               if (get_int(clipboard_disable) == 1)
                 {
-                   set_state(PART:"elm.swallow.clipboard", "default", 0.0);
+                   set_state(PART:"sip_area", "clipboard_on", 0.0);
                    if (get_int(indicator_overlap) == 0)
-                     set_state(PART:"elm.swallow.content", "nooverlap_disable_clipboard_disable_keypad", 0.0);
+                     set_state(PART:"elm.swallow.content", "nooverlap_disable_sip", 0.0);
                    else
-                     set_state(PART:"elm.swallow.content", "overlap_disable_clipboard_disable_keypad", 0.0);
+                     set_state(PART:"elm.swallow.content", "overlap_disable_sip", 0.0);
                 }
               else
                 {
-                   set_state(PART:"elm.swallow.clipboard", "disable_keypad", 0.0);
                    if (get_int(indicator_overlap) == 0)
                      set_state(PART:"elm.swallow.content", "default", 0.0);
                    else
-                     set_state(PART:"elm.swallow.content", "overlap_enable_clipboard", 0.0);
+                     set_state(PART:"elm.swallow.content", "overlap", 0.0);
                 }
            }
         }
-         program { name: "access_on";
+        program { name: "access_on";
             signal: "elm,state,access,on";
             source: "elm";
             action: STATE_SET "visible" 0.0;
             target: "access";
-         }
-         program { name: "access_off";
+        }
+        program { name: "access_off";
             signal: "elm,state,access,off";
             source: "elm";
             action: STATE_SET "default" 0.0;
             target: "access";
-         }
-         program {
-            name: "change_to_landscape";
-            signal: "elm,state,landscape";
-            source: "elm";
-            script {
-               if (get_int(landscape) == 0) {
-                  set_int(portrait_overlap, get_int(indicator_overlap));
-                  set_int(landscape, 1);
-                  set_int(portrait_opacity, get_int(indicator_visible));
-                  run_program(PROGRAM:"overlap_indicator");
-                  run_program(PROGRAM:"transparent_indicator");
-               }
-            }
-         }
-         program {
-            name: "change_to_portrait";
-            signal: "elm,state,portrait";
-            source: "elm";
-            script {
-               if (get_int(landscape) == 1) {  //content start (0, indicator height)
-                  set_int(indicator_overlap, get_int(portrait_overlap));
-                  set_int(indicator_opacity, get_int(portrait_opacity));
-                  if (get_int(indicator_overlap) == 0) { //start (0,60)
-                     run_program(PROGRAM:"nooverlap_indicator");
-                  }
-                  else { //content start (0, 0)
-                     run_program(PROGRAM:"overlap_indicator");
-                  }
-                  if (get_int(portrait_opacity) == 2) //transparent
-                     run_program(PROGRAM:"transparent_indicator");
-                  else if (get_int(portrait_opacity) == 1) //translucent
-                     run_program(PROGRAM:"translucent_indicator");
-                  else
-                     run_program(PROGRAM:"opaque_indicator");
-                  set_int(landscape, 0);
-               }
-            }
-         }
-         program { name: "landscape_mode";
-            source: "elm";
-            signal: "elm,state,orient,90";
-            action: SIGNAL_EMIT "elm,state,landscape" "elm";
-         }
-         program { name: "landscape_mode2";
-            source: "elm";
-            signal: "elm,state,orient,270";
-            action: SIGNAL_EMIT "elm,state,landscape" "elm";
-         }
-         program { name: "portrait_mode";
+        }
+        program {
+            name: "clipboard_on";
+            signal: "elm,state,clipboard,on";
             source: "elm";
-            signal: "elm,state,orient,0";
-            action: SIGNAL_EMIT "elm,state,portrait" "elm";
-         }
-         program { name: "portrait_mode2";
+            action: STATE_SET "clipboard_on" 0.0;
+            target: "sip_area";
+        }
+        program {
+            name: "clipboard_off";
+            signal: "elm,state,clipboard,off";
             source: "elm";
-            signal: "elm,state,orient,180";
-            action: SIGNAL_EMIT "elm,state,portrait" "elm";
-         }
+            action: STATE_SET "default" 0.0;
+            target: "sip_area";
+        }
      }
   }
  group { name: "elm/conformant/base/indicator_overlap";
@@ -449,7 +372,7 @@
            description { state: "default" 0.0;
               align: 0.5 0.5;
               rel2.relative: 1.0 0.0;
-              rel2.to: "elm.swallow.clipboard";
+              rel2.to: "sip_area";
            }
         }
         part { name: "elm.swallow.ug";
@@ -460,7 +383,7 @@
               rel1.relative: 0.0 1.0;
               rel1.to: "elm.swallow.indicator";
               rel2.relative: 1.0 0.0;
-              rel2.to: "elm.swallow.clipboard";
+              rel2.to: "sip_area";
            }
         }
         part { name: "indicator_bg";
@@ -512,15 +435,29 @@
               min: 0 0;
            }
         }
-        part { name: "elm.swallow.clipboard";
-           type: SWALLOW;
+        part { name: "sip_area";
+           type: RECT;
            description { state: "default" 0.0;
               fixed: 0 1;
-              align: 0.0 1.0;
+              min: 0 0;
               rel1.relative: 0.0 0.0;
               rel1.to_y: "elm.swallow.virtualkeypad";
-              rel2.relative: 1.0 0.0;
+              rel2.relative: 1.0 1.0;
               rel2.to_y: "elm.swallow.virtualkeypad";
+              visible: 0;
+           }
+           description { state: "clipboard_on" 0.0;
+              inherit: "default" 0.0;
+              rel1.to_y: "elm.swallow.clipboard";
+              rel2.to_y: "elm.swallow.clipboard";
+           }
+        }
+        part { name: "elm.swallow.clipboard";
+           type: SWALLOW;
+           description { state: "default" 0.0;
+              fixed: 0 1;
+              align: 0.0 1.0;
+              rel1.relative: 0.0 1.0;
            }
         }
         part { name: "elm.swallow.virtualkeypad";
@@ -588,6 +525,20 @@
                   set_state(PART:"indicator_bg", "transparent", 0.0);
             }
         }
+        program {
+            name: "clipboard_on";
+            signal: "elm,state,clipboard,on";
+            source: "elm";
+            action: STATE_SET "clipboard_on" 0.0;
+            target: "sip_area";
+        }
+        program {
+            name: "clipboard_off";
+            signal: "elm,state,clipboard,off";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "sip_area";
+        }
      }
   }
 
Domain: UI Framework / EFL;