[WorldClock] Fit cities label in layout

Change-Id: I9c9083125b39b95bbc4bc88238490153c4532471

diff --git a/clock/res/edje/WorldClock.edc b/clock/res/edje/WorldClock.edc
index 120189c..478d395 100644 (file)
--- a/clock/res/edje/WorldClock.edc
+++ b/clock/res/edje/WorldClock.edc
@@ -75,16 +75,16 @@ collections {
                parts {
                        spacer { "main.top"; scale;
                                desc { "default";
-                                       min: 720 17;
-                                       max: 720 17;
+                                       min: 0 17;
+                                       max: -1 17;
                                        align: 0.5 0.0;
                                }
                        }
                        group { "main.world.map"; scale;
                                source:"world.map";
                                desc { "default";
-                                       min: 720 406;
-                                       max: 720 406;
+                                       min: 0 406;
+                                       max: -1 406;
                                        rel1 {
                                                relative: 0.0 1.0;
                                                to: "main.top";
@@ -96,8 +96,8 @@ collections {
                        group { "main.timezone.details"; scale;
                                source: "timezone.details";
                                desc { "default";
-                                       max: 720 256;
-                                       max: 720 256;
+                                       min: 0 256;
+                                       max: -1 256;
                                        rel1 {
                                                relative: 0.0 1.0;
                                                to: "main.world.map";
@@ -109,7 +109,6 @@ collections {
                        group { "main.locations.list"; scale;
                                source: "locations.list";
                                desc { "default";
-                                       max: 720 -1;
                                        rel1 {
                                                relative: 0.0 1.0;
                                                to: "main.timezone.details";
@@ -129,8 +128,8 @@ collections {
                parts {
                        swallow { "map"; scale;
                                desc { "default";
-                                       min: 720 406;
-                                       max: 720 406;
+                                       min: 0 406;
+                                       max: -1 406;
                                        fixed: 1 1;
                                }
                        }
@@ -180,8 +179,8 @@ collections {
 
                        spacer { "arrow.spacer.top"; scale;
                                desc { "default";
-                                       min: 720 196;
-                                       max: 720 196;
+                                       min: 0 196;
+                                       max: -1 196;
                                        align: 0.5 0.0;
                                        rel1.to: "map";
                                }
@@ -189,8 +188,8 @@ collections {
 
                        spacer { "arrow.spacer.bottom"; scale;
                                desc { "default";
-                                       min: 720 130;
-                                       max: 720 130;
+                                       min: 0 130;
+                                       max: -1 130;
                                        align: 0.5 1.0;
                                        rel1.to: "map";
                                }
@@ -433,7 +432,7 @@ collections {
                                        desc { "default";
                                                align: 0.5 0.0;
                                                min: 0 94;
-                                               max: 720 94;
+                                               max: -1 94;
                                                color: 0 0 0 0;
                                                rel1 {
                                                        offset: 0 50;

diff --git a/clock/src/View/WorldClockView.cpp b/clock/src/View/WorldClockView.cpp
index b4d7ee0..df7f492 100644 (file)
--- a/clock/src/View/WorldClockView.cpp
+++ b/clock/src/View/WorldClockView.cpp
@@ -657,6 +657,7 @@ void WorldClockView::CreateTimezoneCitiesList()
 {
        timezone_cities_ = elm_label_add(world_clock_);
        evas_object_size_hint_align_set(timezone_cities_, EVAS_HINT_FILL, 0.0);
+       elm_label_ellipsis_set(timezone_cities_, EINA_TRUE);
 
        evas_object_show (timezone_cities_);