[Merge conflict resolved]

[elm_colorpalette]: CQs related to genlist horizontal scroll when
colorpalette is added resolved.

Change-Id: Ie0a9625e5193612852bed2bbc4fa309e740051de

diff --git a/themes/groups/colorpalette.edc b/themes/groups/colorpalette.edc
index 5a185ed..2cb6156 100644 (file)
--- a/themes/groups/colorpalette.edc
+++ b/themes/groups/colorpalette.edc
@@ -35,7 +35,7 @@
             mouse_events: 1;
             description{
             state: "default" 0.0;
-            min: COLORPALETTE_WIDTH_INC COLORPALETTE_HEIGHT_INC;
+            min: COLORPALETTE_BASE_WIDTH_INC COLORPALETTE_HEIGHT_INC;
             color: COLORPALETTE_BASE_COLOR_INC;
             }
          }
@@ -111,7 +111,7 @@
             mouse_events: 1;
             description{
             state: "default" 0.0;
-            min: COLORPALETTE_WIDTH_INC COLORPALETTE_HEIGHT_INC;
+            min: COLORPALETTE_BASE_WIDTH_INC COLORPALETTE_HEIGHT_INC;
             color: 0 0 0 0;
             }
          }
@@ -187,7 +187,7 @@
             mouse_events: 1;
             description{
                state: "default" 0.0;
-               min: COLORPALETTE_WIDTH_LANDSCAPE_INC COLORPALETTE_HEIGHT_LANDSCAPE_INC;
+               min: COLORPALETTE_BASE_WIDTH_LANDSCAPE_INC COLORPALETTE_HEIGHT_LANDSCAPE_INC;
                color: COLORPALETTE_BASE_COLOR_INC;
             }
          }
@@ -263,7 +263,7 @@
             mouse_events: 1;
             description{
                state: "default" 0.0;
-               min: COLORPALETTE_WIDTH_LANDSCAPE_INC COLORPALETTE_HEIGHT_LANDSCAPE_INC;
+               min: COLORPALETTE_BASE_WIDTH_LANDSCAPE_INC COLORPALETTE_HEIGHT_LANDSCAPE_INC;
                color: 0 0 0 0;
             }
          }

diff --git a/themes/inc/nbeat-black-inc.edc b/themes/inc/nbeat-black-inc.edc
index eccf265..4797b52 100644 (file)
--- a/themes/inc/nbeat-black-inc.edc
+++ b/themes/inc/nbeat-black-inc.edc
@@ -774,8 +774,6 @@
 #define COLORPALETTE_PADDING_UP_INC 15
 #define COLORPALETTE_PADDING_DOWN_INC 15
 #define COLORPALETTE_HEIGHT_INC 154
-#define COLORPALETTE_WIDTH_INC 470
-#define COLORPALETTE_WIDTH_LANDSCAPE_INC 790
 #define COLORPALETTE_HEIGHT_LANDSCAPE_INC 86
 #define COLORPALETTE_PADDING_UP_LANDSCAPE_INC 17
 #define COLORPALETTE_PADDING_DOWN_LANDSCAPE_INC 17

diff --git a/themes/inc/nbeat-hd-inc.edc b/themes/inc/nbeat-hd-inc.edc
index 62d21c7..2568ae6 100644 (file)
--- a/themes/inc/nbeat-hd-inc.edc
+++ b/themes/inc/nbeat-hd-inc.edc
@@ -803,8 +803,6 @@
 #define COLORPALETTE_PADDING_UP_INC 24
 #define COLORPALETTE_PADDING_DOWN_INC 24
 #define COLORPALETTE_HEIGHT_INC 246
-#define COLORPALETTE_WIDTH_INC 704
-#define COLORPALETTE_WIDTH_LANDSCAPE_INC 1264
 #define COLORPALETTE_HEIGHT_LANDSCAPE_INC 134
 #define COLORPALETTE_PADDING_UP_LANDSCAPE_INC 24
 #define COLORPALETTE_PADDING_DOWN_LANDSCAPE_INC 24

diff --git a/themes/inc/nbeat-inc.edc b/themes/inc/nbeat-inc.edc
index 1383206..ff808e3 100644 (file)
--- a/themes/inc/nbeat-inc.edc
+++ b/themes/inc/nbeat-inc.edc
@@ -797,8 +797,6 @@
 #define COLORPALETTE_PADDING_UP_INC 15
 #define COLORPALETTE_PADDING_DOWN_INC 15
 #define COLORPALETTE_HEIGHT_INC 154
-#define COLORPALETTE_WIDTH_INC 470
-#define COLORPALETTE_WIDTH_LANDSCAPE_INC 790
 #define COLORPALETTE_HEIGHT_LANDSCAPE_INC 86
 #define COLORPALETTE_PADDING_UP_LANDSCAPE_INC 17
 #define COLORPALETTE_PADDING_DOWN_LANDSCAPE_INC 17