[App manager] 'Moving' popup fixed

- style added
- path updated

Change-Id: If1cf3773a90890f728b6b6f8d72fd73bdc30caa8
Signed-off-by: Radek Kintop <r.kintop@samsung.com>

diff --git a/resource/setting-theme.edc b/resource/setting-theme.edc
index 73b9aefc6fbc3377580abef4d4fddb022dfc5fcc..2eff1ad425386014903bcd614ecc533ff886ddb8 100644 (file)
--- a/resource/setting-theme.edc
+++ b/resource/setting-theme.edc
@@ -3781,4 +3781,99 @@ collections
                        }
                }
        }
+
+       group { name: "processing_view_layout";
+          styles {
+                 style { name: "popup_processing_style";
+                        base: "font=Tizen:style=Regular align=left font_size="30" color=#000000 wrap=mixed ellipsis=1.0 text_class=tizen";
+                        tag:  "br" "\n";
+                        tag:  "tab" "\t";
+                 }
+          }
+          parts {
+                 part { name: "bg";
+                        type: SPACER;
+                        scale: 1;
+                        description { state: "default" 0.0;
+                               min: 0 90;
+                               fixed: 1 0;
+                        }
+                 }
+                 part { name: "pad_l";
+                        type: SPACER;
+                        scale: 1;
+                        description { state: "default" 0.0;
+                               min: 15 0;
+                               fixed: 1 0;
+                               rel1.relative: 0.0 0.0;
+                               rel2.relative: 0.0 1.0;
+                               align: 0.0 0.0;
+                        }
+                 }
+                 part { name: "pad_r";
+                        type: SPACER;
+                        scale: 1;
+                        description { state: "default" 0.0;
+                               min: 15 0;
+                               fixed: 1 0;
+                               rel1.relative: 1.0 0.0;
+                               rel2.relative: 1.0 1.0;
+                               align: 1.0 0.0;
+                        }
+                 }
+                 part { name: "processing";
+                        type: SWALLOW;
+                        scale: 1;
+                        description { state: "default" 0.0;
+                               fixed: 1 1;
+                               min: 36 36;
+                               max: 36 36;
+                               rel1 {
+                                  relative: 1.0 0.0;
+                                  to_x: "pad_l";
+                               }
+                               rel2 {
+                                  relative: 0.0 1.0;
+                                  to_x: "pad_r";
+                               }
+                               align: 0.0 0.5;
+                        }
+                 }
+                 part { name: "pad_after_processing";
+                        type: SPACER;
+                        scale: 1;
+                        description { state: "default" 0.0;
+                               fixed: 1 1;
+                               min: 15 90;
+                               rel1 {
+                                  relative: 1.0 0.0;
+                                  to: "processing";
+                               }
+                               rel2.to: "processing";
+                               align: 0.0 0.5;
+                        }
+                 }
+                 part { name: "elm.text";
+                        type: TEXTBLOCK;
+                        scale: 1;
+                        description { state: "default" 0.0;
+                               min: 0 90;
+                               fixed: 0 1;
+                               rel1 {
+                                  relative: 1.0 0.0;
+                                  to: "pad_after_processing";
+                               }
+                               rel2 {
+                                  relative: 0.0 1.0;
+                                  to_x: "pad_r";
+                               }
+                               align: 0.0 0.5;
+                               text {
+                                  style: "popup_processing_style";
+                                  min: 0 1;
+                               }
+                        }
+                 }
+          }
+       }
 }

diff --git a/setting-appmgr/src/setting-appmgr-main.c b/setting-appmgr/src/setting-appmgr-main.c
index cf58e17b0673665814b4bf8628e0f2ba3755c366..65349194792e8ad6d7b65900e16d8ee288c476dd 100644 (file)
--- a/setting-appmgr/src/setting-appmgr-main.c
+++ b/setting-appmgr/src/setting-appmgr-main.c
@@ -103,7 +103,9 @@ static void _more_menu_move_ctxpopup(SettingAppMgr *ad)
 static void naviframe_resize_cb(void *data, Evas *e, Evas_Object *obj,
                void *event_info)
 {
-       _more_menu_move_ctxpopup(data);
+       SettingAppMgr *ad = data;
+       if (ad && setting_view_node_get_cur_view() == ad->main_view)
+               _more_menu_move_ctxpopup(data);
 }
 
 static void appmgr_main_sort_sel(void *data, Evas_Object *obj,

diff --git a/setting-common/src/setting-common-draw-popup.c b/setting-common/src/setting-common-draw-popup.c
index c24f62f9b77d2f3a0ac3822569bdba698aac1d80..1b1c023581d4178b69a6f1c61091a62b2102e764 100644 (file)
--- a/setting-common/src/setting-common-draw-popup.c
+++ b/setting-common/src/setting-common-draw-popup.c
@@ -442,7 +442,7 @@ Evas_Object *setting_create_popup_with_progressbar(void *data,
 
        /* layout */
        layout = elm_layout_add(popup);
-       elm_layout_file_set(layout, SETTINGS_EDJ, "processing_view_layout");
+       elm_layout_file_set(layout, SETTING_THEME_EDJ_NAME, "processing_view_layout");
        evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND,
                        EVAS_HINT_EXPAND);
        if (title)