Fix build error

Change-Id: If73140496abbeb6ccdfea00d26d5455b5bd91c5b

diff --git a/themes/inc/tizen-dark-inc.edc b/themes/inc/tizen-dark-inc.edc
index 608e042..76b7c22 100755 (executable)
--- a/themes/inc/tizen-dark-inc.edc
+++ b/themes/inc/tizen-dark-inc.edc
@@ -837,7 +837,8 @@
 #define SELECTION_INFO_MIN_VER_BOTTOM_64_H_INC       150
 #define SELECTION_INFO_MIN_VER_BOTTOM_86_H_INC       186
 
-#define POPUP_DESCRIPTION_DEFAULT_TEXT_MIN_INC 648 300
+#define POPUP_DESCRIPTION_DEFAULT_TEXT_MIN_INC_W 580
+#define POPUP_DESCRIPTION_DEFAULT_TEXT_MIN_INC_H 300
 
 #define POPUP_ITEM_BG_DEFAULT_MIN_INC 620 112
 #define POPUP_ITEM_LEFT_MIN_PADDING_INC 26 0

diff --git a/themes/widgets/naviframe.edc b/themes/widgets/naviframe.edc
index 24aa424..a6ee997 100644 (file)
--- a/themes/widgets/naviframe.edc
+++ b/themes/widgets/naviframe.edc
@@ -179,7 +179,7 @@
                   }
 
                   len = get_int(title_text_w) + NAVIFRAME_TITLE_SLIDE_TEXT_GAP;
-                  set_float(title_duration, len NAVIFRAME_TITLE_SLIDE_SPEED_WEIGHT);
+                  set_float(title_duration, len * NAVIFRAME_TITLE_SLIDE_SPEED_WEIGHT);
 
                   set_int(title_slide_stop, 0);
 
@@ -1618,7 +1618,6 @@
                   set_state(PART:"elm.text.subtitle", "landscape", 0.0);
                   set_state(PART:"title_left_btn", "landscape", 0.0);
                   set_state(PART:"title_right_btn", "landscape", 0.0);
-                  set_state(PART:"title_more_btn", "landscape", 0.0);
                   set_state(PART:"toolbar_more_btn", "landscape", 0.0);
                   set_state(PART:"elm.swallow.prev_btn", "landscape", 0.0);
 
@@ -1658,7 +1657,6 @@
                   set_state(PART:"elm.text.subtitle", "default", 0.0);
                   set_state(PART:"title_left_btn", "default", 0.0);
                   set_state(PART:"title_right_btn", "default", 0.0);
-                  set_state(PART:"title_more_btn", "default", 0.0);
                   set_state(PART:"toolbar_more_btn", "default", 0.0);
                   set_state(PART:"elm.swallow.prev_btn", "default", 0.0);
 
@@ -1797,9 +1795,9 @@
                len = get_int(title_text_w) + NAVIFRAME_TITLE_SLIDE_TEXT_GAP;
 
                if (get_int(landscape))
-                 set_float(title_duration, len / NAVIFRAME_TITLE_SLIDE_SPEED_WEIGHT);
+                 set_float(title_duration, len * NAVIFRAME_TITLE_SLIDE_SPEED_WEIGHT);
                else
-                 set_float(title_duration, len / NAVIFRAME_TITLE_SLIDE_SPEED_WEIGHT);
+                 set_float(title_duration, len * NAVIFRAME_TITLE_SLIDE_SPEED_WEIGHT);
 
                set_int(title_slide_stop, 0);
 
@@ -3170,6 +3168,7 @@
             source: "elm";
             action: STATE_SET "left" 0.0;
             target: "base";
+            target: "clipper";
             transition: DECELERATE NAVIFRAME_VIEW_TRANS_TIME;
             after: "pushed_finished";
          }
@@ -3483,3 +3482,4 @@
          }
       }
    }
+

diff --git a/themes/widgets/popup.edc b/themes/widgets/popup.edc
index 49d8b5a..39c3603 100644 (file)
--- a/themes/widgets/popup.edc
+++ b/themes/widgets/popup.edc
@@ -435,8 +435,8 @@ group { name: "elm/label/base/popup/default";
          mouse_events: 0;
          scale: 1;
          description { state: "default" 0.0;
-            min: POPUP_DESCRIPTION_DEFAULT_TEXT_MIN_INC;
-            max: POPUP_DESCRIPTION_DEFAULT_TEXT_MIN_INC;
+            min: POPUP_DESCRIPTION_DEFAULT_TEXT_MIN_INC_W POPUP_DESCRIPTION_DEFAULT_TEXT_MIN_INC_H;
+            max: POPUP_DESCRIPTION_DEFAULT_TEXT_MIN_INC_W POPUP_DESCRIPTION_DEFAULT_TEXT_MIN_INC_H;
             text {
                style: "popup_desc_style";
                min: 0 0;