Resize power off and restart image to solve TSAM-5124, image cut issue 14/76014/2 accepted/tizen/common/20160622.150142 submit/tizen/20160622.115546
authorchangjoo.lee <changjoo.lee@samsung.com>
Wed, 22 Jun 2016 10:25:51 +0000 (19:25 +0900)
committerChang Joo Lee <changjoo.lee@samsung.com>
Wed, 22 Jun 2016 11:15:20 +0000 (04:15 -0700)
Change-Id: I448ad0bee15ad5da91b1334422d7f29dd8cfbf3c
Signed-off-by: changjoo.lee <changjoo.lee@samsung.com>
core_power_off.png
core_restart.png
src/powerkey/powerkey.c

index 132afb635932fc4dd6933eb25bdd3ee112d07e91..379a09ef1a679da1e82b4181379185c67255f5a0 100755 (executable)
Binary files a/core_power_off.png and b/core_power_off.png differ
index 46b56c237142149eec9c43f5d5f372c9c77a6684..fcf95c61c8b90bea9beffed0ecbb85e3aada57b0 100755 (executable)
Binary files a/core_restart.png and b/core_restart.png differ
index 31a905fd2ea774eea0493a8e6b8460104a03702c..24898c987f94b3b012d5df1a3b5c727d7d086a87 100755 (executable)
@@ -143,6 +143,7 @@ static Evas_Object* gl_image_get_cb(void *data, Evas_Object *obj, const char *pa
        Evas_Object *img = elm_image_add(obj);
        Evas_Object *check;
        int index = (int) data;
+       Evas_Coord w, h;
 
        if (!img) {
                _E("BAD image");
@@ -153,7 +154,8 @@ static Evas_Object* gl_image_get_cb(void *data, Evas_Object *obj, const char *pa
        case 0:
                if (!strncmp(part, "elm.swallow.icon", sizeof("elm.swallow.icon"))) {
                        elm_image_file_set(img, RESDIR"/core_power_off.png", NULL);
-                       evas_object_size_hint_min_set(img, ELM_SCALE_SIZE(50), ELM_SCALE_SIZE(50));
+                          elm_image_object_size_get(img, &w, &h);
+                          evas_object_size_hint_min_set(img, w, h);
                        _D("Power off img");
                        return img;
                } else if (!strncmp(part, "elm.swallow.icon.end", sizeof("elm.swallow.icon.end"))) {
@@ -165,7 +167,9 @@ static Evas_Object* gl_image_get_cb(void *data, Evas_Object *obj, const char *pa
        case 1:
                if (!strncmp(part, "elm.swallow.icon", sizeof("elm.swallow.icon"))) {
                        elm_image_file_set(img, RESDIR"/core_restart.png", NULL);
-                       evas_object_size_hint_min_set(img, ELM_SCALE_SIZE(50), ELM_SCALE_SIZE(50));
+                          elm_image_object_size_get(img, &w, &h);
+                          evas_object_size_hint_min_set(img, w, h);
+
                        _D("Restart img");
                        return img;
                } else if (!strncmp(part, "elm.swallow.icon.end", sizeof("elm.swallow.icon.end"))) {
@@ -232,7 +236,7 @@ int powerkey_list(bundle *b, const struct popup_ops *ops)
 
        evas_object_show(genlist);
        elm_box_pack_end(box, genlist);
-       evas_object_size_hint_min_set(box, -1, 350);
+       evas_object_size_hint_min_set(box, -1, 250);
        elm_object_content_set(popup, box);
 
        evas_object_show(popup);