From: Rajeev Ranjan <rajeev.r@samsung.com>
Date: Tue, 10 Apr 2012 11:48:50 +0000 (+0530)
Subject: [Popup] Change for focus hook implementation. State change to visible in edje does... 
X-Git-Tag: 2.0_alpha~167^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9800d9ee764d4015617bf2ac9993ca9e5ede8701;p=framework%2Fuifw%2Fefl-theme-tizen.git

[Popup] Change for focus hook implementation. State change to visible in edje does not affect the visibility of swallow part currently, hence made default state visible and handled visibility by unsetting the action area.

Change-Id: I1508719a4ca06ddedfdc225157ba12071c5bcbab
---

diff --git a/themes/widgets/popup.edc b/themes/widgets/popup.edc
index 966b603..2230ca1 100644
--- a/themes/widgets/popup.edc
+++ b/themes/widgets/popup.edc
@@ -313,14 +313,9 @@ group { name: "elm/popup/base/default";
          scale : 1;
          description { state: "default" 0.0;
             align: 0.0 0.0;
-            visible: 0;
             rel1.to: "elm.bg.action_area";
             rel2.to: "elm.bg.action_area";
          }
-         description { state: "visible" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
       }
    }
    programs {
@@ -389,7 +384,6 @@ group { name: "elm/popup/base/default";
             else
               set_state(PART:"elm.swallow.content", "show_action_area", 0.0);
             set_state(PART:"elm.bg.action_area", "visible", 0.0);
-            set_state(PART:"elm.swallow.action_area", "visible", 0.0);
          }
       }
       program { name: hide_action_area;
@@ -405,7 +399,6 @@ group { name: "elm/popup/base/default";
             else
               set_state(PART:"elm.swallow.content", "default", 0.0);
             set_state(PART:"elm.bg.action_area", "default", 0.0);
-            set_state(PART:"elm.swallow.action_area", "default", 0.0);
          }
       }
    } /* end of programs */
@@ -882,6 +875,7 @@ group { name: "elm/popup/base/verticalbuttonstyle";
               style: "popup_title_style";
               min: 0 0;
               max: 0 1;
+              align: 0.5 0.0;
             }
             color: POPUP_DEFAULT_TITLE_TEXT_COLOR_INC;
             visible:0;
@@ -941,17 +935,13 @@ group { name: "elm/popup/base/verticalbuttonstyle";
             align: 0.5 1.0;
             fixed: 0 1;
             min: POPUP_BASE_VERTICAL_BUTTON_BUTTONAREA_DEFAULT_MIN_INC;
-            visible: 0;
+            visible: 1;
             rel1 {
                relative: 0.0 1.0;
                to: "base";
             }
             rel2.to: "base";
          }
-         description { state: "visible" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
       }
    }
    programs {
@@ -1019,7 +1009,6 @@ group { name: "elm/popup/base/verticalbuttonstyle";
               set_state(PART:"elm.swallow.content", "show_action_title_area", 0.0);
             else
               set_state(PART:"elm.swallow.content", "show_action_area", 0.0);
-            set_state(PART:"elm.swallow.action_area", "visible", 0.0);
          }
       }
       program { name: hide_action_area;
@@ -1034,7 +1023,6 @@ group { name: "elm/popup/base/verticalbuttonstyle";
               set_state(PART:"elm.swallow.content", "show_title_area", 0.0);
             else
               set_state(PART:"elm.swallow.content", "default", 0.0);
-            set_state(PART:"elm.swallow.action_area", "default", 0.0);
          }
       }
    } /* end of programs */
@@ -1451,6 +1439,7 @@ group { name: "elm/popup/base/customstyle";
               style: "popup_title_custom_style";
               min: 0 0;
               max: 0 1;
+              align: 0.5 0.0;
             }
             color: POPUP_CUSTOMSTYLE_TITLE_TEXT_COLOR_INC;
             visible:0;
@@ -1530,14 +1519,9 @@ group { name: "elm/popup/base/customstyle";
          scale : 1;
          description { state: "default" 0.0;
             align: 0.0 0.0;
-            visible: 0;
             rel1.to: "elm.bg.action_area";
             rel2.to: "elm.bg.action_area";
          }
-         description { state: "visible" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
       }
    }
    programs {
@@ -1609,7 +1593,6 @@ group { name: "elm/popup/base/customstyle";
             else
               set_state(PART:"elm.swallow.content", "show_action_area", 0.0);
             set_state(PART:"elm.bg.action_area", "visible", 0.0);
-            set_state(PART:"elm.swallow.action_area", "visible", 0.0);
          }
       }
       program { name: hide_action_area;
@@ -1625,7 +1608,6 @@ group { name: "elm/popup/base/customstyle";
             else
               set_state(PART:"elm.swallow.content", "default", 0.0);
             set_state(PART:"elm.bg.action_area", "default", 0.0);
-            set_state(PART:"elm.swallow.action_area", "default", 0.0);
          }
       }
    } /* end of programs */
@@ -1887,6 +1869,7 @@ group { name: "elm/popup/base/volumebarstyle";
               style: "popup_title_style";
               min: 0 0;
               max: 0 1;
+              align: 0.5 0.0;
             }
             color: POPUP_DEFAULT_TITLE_TEXT_COLOR_INC;
             visible:0;
@@ -1972,14 +1955,9 @@ group { name: "elm/popup/base/volumebarstyle";
          scale : 1;
          description { state: "default" 0.0;
             align: 0.0 0.0;
-            visible: 0;
             rel1.to: "elm.bg.action_area";
             rel2.to: "elm.bg.action_area";
          }
-         description { state: "visible" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
       }
    }
    programs {
@@ -2048,7 +2026,6 @@ group { name: "elm/popup/base/volumebarstyle";
             else
               set_state(PART:"elm.swallow.content", "show_action_area", 0.0);
             set_state(PART:"elm.bg.action_area", "visible", 0.0);
-            set_state(PART:"elm.swallow.action_area", "visible", 0.0);
          }
       }
       program { name: hide_action_area;
@@ -2064,7 +2041,6 @@ group { name: "elm/popup/base/volumebarstyle";
             else
               set_state(PART:"elm.swallow.content", "default", 0.0);
             set_state(PART:"elm.bg.action_area", "default", 0.0);
-            set_state(PART:"elm.swallow.action_area", "default", 0.0);
          }
       }
    } /* end of programs */