[WorldClock] Show select all checkbox on delete view

This patch fixes displaying issue of switch in detele city list item.
Additionally aligns switch widget in delete alarm and city item so it is
in the same line as select all switch.

Change-Id: Idebf862dc257b8cdcac42b3863e1ff437fe0b930

diff --git a/clock/res/edje/WorldClockDeleteReorderList.edc b/clock/res/edje/WorldClockDeleteReorderList.edc
index fdfbbabbaaa313157a50be1fa162d15780040ca8..3a0b837f8df957f82f4d81aef54b25f668784d93 100644 (file)
--- a/clock/res/edje/WorldClockDeleteReorderList.edc
+++ b/clock/res/edje/WorldClockDeleteReorderList.edc
@@ -191,8 +191,8 @@ collections {
                        spacer { "padding.right"; scale;
                                desc { "default";
                                        fixed: 1 0;
-                                       min: 32 0;
-                                       max: 32 -1;
+                                       min: 3 0;
+                                       max: 3 -1;
                                        align: 1.0 0.5;
                                        rel1.to: "base";
                                        rel2.to: "base";

diff --git a/clock/res/edje/alarm.edc b/clock/res/edje/alarm.edc
index e1381e9eaa1f373ae759c1a25dcd99f608a18c73..b590e1cec972c86eea6c9eaa1eae93b47718c08b 100644 (file)
--- a/clock/res/edje/alarm.edc
+++ b/clock/res/edje/alarm.edc
@@ -362,7 +362,7 @@ collections {
                        swallow { "onoff"; scale;
                                desc { "default";
                                        fixed: 1 1;
-                                       align: 0.5 0.5;
+                                       align: 0.4 0.5;
                                        min: 50 50;
                                        max: 50 50;
                                        rel1.to: "area.onoff.right";

diff --git a/clock/src/View/WorldClockDeleteItemsView.cpp b/clock/src/View/WorldClockDeleteItemsView.cpp
index 03ea43c7a102e4e3f8e26ef1f1871b643459f13b..e3c0ace0aa046d84e336dbfea7624ccf54d570b3 100644 (file)
--- a/clock/src/View/WorldClockDeleteItemsView.cpp
+++ b/clock/src/View/WorldClockDeleteItemsView.cpp
@@ -281,7 +281,7 @@ void WorldClockDeleteItemsView::CreateSelectAll()
 
        all_selected_ = false;
 
-       itc->item_style = "select_all";
+       itc->item_style = "type1";
 
        itc->func.text_get = [](void *data, Evas_Object *obj, const char *part) -> char* {
                if (!strcmp(part, "elm.text")) {
@@ -291,7 +291,7 @@ void WorldClockDeleteItemsView::CreateSelectAll()
        };
        itc->func.content_get = [](void *data, Evas_Object *obj, const char *part) -> Evas_Object* {
                WorldClockDeleteItemsView *view = static_cast<WorldClockDeleteItemsView *>(data);
-               if (!strcmp(part, "sw.check")) {
+               if (!strcmp(part, "elm.swallow.end")) {
                        view->select_all_checkbox_ = elm_check_add(obj);
                        elm_check_state_set(view->select_all_checkbox_, view->all_selected_);
                        evas_object_propagate_events_set(view->select_all_checkbox_, EINA_FALSE);