[*][Genlist] Limited the height of swallow area for slide and slide4

styles according to GUI guideline.
This fixes CQ H0100135858.
This needs to be applied to slide2 and slide3 styles later.

Change-Id: I6ea29fccb48afc38da640bdff549ac2971ac344c

diff --git a/themes/groups/genlist/genlist_sweep.edc b/themes/groups/genlist/genlist_sweep.edc
index bbd59e1..dc93dbf 100644 (file)
--- a/themes/groups/genlist/genlist_sweep.edc
+++ b/themes/groups/genlist/genlist_sweep.edc
@@ -153,8 +153,9 @@
             clip_to: "disclip";
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_260_INC 0;
-               fixed: 1 0;
+               min: GENLIST_SIZE_260_INC GENLIST_SIZE_SLIDE_38_INC;
+               max: GENLIST_SIZE_260_INC GENLIST_SIZE_SLIDE_38_INC;
+               fixed: 1 1;
                rel1 {
                   relative: 0.5 1;
                   to_x: "base";
@@ -926,8 +927,9 @@
             clip_to: "disclip";
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_SLIDE_109_INC 0;
-               fixed: 1 0;
+               min: GENLIST_SIZE_SLIDE_109_INC GENLIST_SIZE_SLIDE_38_INC;
+               max: GENLIST_SIZE_SLIDE_109_INC GENLIST_SIZE_SLIDE_38_INC;
+               fixed: 1 1;
                align: 1 0.5;
                rel1.to: "base.padding.center";
                rel2 {
@@ -958,8 +960,9 @@
             clip_to: "disclip";
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_SLIDE_109_INC 0;
-               fixed: 1 0;
+               min: GENLIST_SIZE_SLIDE_109_INC GENLIST_SIZE_SLIDE_38_INC;
+               max: GENLIST_SIZE_SLIDE_109_INC GENLIST_SIZE_SLIDE_38_INC;
+               fixed: 1 1;
                align: 1 0.5;
                rel1.to: "elm.padding.swallow.2.left";
                rel2 {
@@ -973,8 +976,9 @@
             clip_to: "disclip";
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_SLIDE_109_INC 0;
-               fixed: 1 0;
+               min: GENLIST_SIZE_SLIDE_109_INC GENLIST_SIZE_SLIDE_38_INC;
+               max: GENLIST_SIZE_SLIDE_109_INC GENLIST_SIZE_SLIDE_38_INC;
+               fixed: 1 1;
                align: 0 0.5;
                rel1 {
                   relative: 1 0;
@@ -1005,8 +1009,9 @@
             clip_to: "disclip";
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_SLIDE_109_INC 0;
-               fixed: 1 0;
+               min: GENLIST_SIZE_SLIDE_109_INC GENLIST_SIZE_SLIDE_38_INC;
+               max: GENLIST_SIZE_SLIDE_109_INC GENLIST_SIZE_SLIDE_38_INC;
+               fixed: 1 1;
                align: 0 0.5;
                rel1 {
                   relative: 1 0;

diff --git a/themes/inc/nbeat-black-hd-inc.edc b/themes/inc/nbeat-black-hd-inc.edc
index 40f08c7..41045a5 100644 (file)
--- a/themes/inc/nbeat-black-hd-inc.edc
+++ b/themes/inc/nbeat-black-hd-inc.edc
@@ -177,6 +177,7 @@
 #define GENLIST_SIZE_35_INC 56
 #define GENLIST_SIZE_36_INC 57
 #define GENLIST_SIZE_38_INC 61
+#define GENLIST_SIZE_SLIDE_38_INC 60
 #define GENLIST_SIZE_40_INC 64
 #define GENLIST_SIZE_50_INC 80
 #define GENLIST_SIZE_56_INC 90

diff --git a/themes/inc/nbeat-black-inc.edc b/themes/inc/nbeat-black-inc.edc
index 6de993a..e9a65f1 100644 (file)
--- a/themes/inc/nbeat-black-inc.edc
+++ b/themes/inc/nbeat-black-inc.edc
@@ -174,6 +174,7 @@
 #define GENLIST_SIZE_35_INC 35
 #define GENLIST_SIZE_36_INC 36
 #define GENLIST_SIZE_38_INC 38
+#define GENLIST_SIZE_SLIDE_38_INC 38
 #define GENLIST_SIZE_40_INC 40
 #define GENLIST_SIZE_50_INC 50
 #define GENLIST_SIZE_56_INC 56

diff --git a/themes/inc/nbeat-hd-inc.edc b/themes/inc/nbeat-hd-inc.edc
index 8e6ec40..5326fb7 100644 (file)
--- a/themes/inc/nbeat-hd-inc.edc
+++ b/themes/inc/nbeat-hd-inc.edc
@@ -176,6 +176,7 @@
 #define GENLIST_SIZE_35_INC 56
 #define GENLIST_SIZE_36_INC 57
 #define GENLIST_SIZE_38_INC 61
+#define GENLIST_SIZE_SLIDE_38_INC 60
 #define GENLIST_SIZE_40_INC 64
 #define GENLIST_SIZE_50_INC 80
 #define GENLIST_SIZE_56_INC 90

diff --git a/themes/inc/nbeat-inc.edc b/themes/inc/nbeat-inc.edc
index dd81cce..733d474 100644 (file)
--- a/themes/inc/nbeat-inc.edc
+++ b/themes/inc/nbeat-inc.edc
@@ -174,6 +174,7 @@
 #define GENLIST_SIZE_35_INC 35
 #define GENLIST_SIZE_36_INC 36
 #define GENLIST_SIZE_38_INC 38
+#define GENLIST_SIZE_SLIDE_38_INC 38
 #define GENLIST_SIZE_40_INC 40
 #define GENLIST_SIZE_50_INC 50
 #define GENLIST_SIZE_56_INC 56