fix Ticket #1122

SVN revision: 73614

diff --git a/data/themes/widgets/button.edc b/data/themes/widgets/button.edc
index aac49ef..fde4d20 100644 (file)
--- a/data/themes/widgets/button.edc
+++ b/data/themes/widgets/button.edc
@@ -378,10 +378,10 @@ group { name: "elm/button/base/hoversel_vertical/default";
          }
          description { state: "visible" 0.0;
             inherit: "default" 0.0;
-            fixed: 0 0;
+            fixed: 1 0;
             visible: 1;
             aspect: 1.0 1.0;
-            aspect_preference: VERTICAL;
+//            aspect_preference: VERTICAL;
             rel2.offset: 2 -5;
          }
          description { state: "icononly" 0.0;
@@ -389,13 +389,13 @@ group { name: "elm/button/base/hoversel_vertical/default";
             fixed: 0 0;
             visible: 1;
             align: 0.5 0.5;
-            aspect: 1.0 1.0;
+//            aspect: 1.0 1.0;
             rel1 {
                to_x: "button_image";
                offset: -3 -3;
                relative: 1.0 1.0;
             }
-            aspect_preference: VERTICAL;
+//            aspect_preference: VERTICAL;
          }
       }
       part {
@@ -655,18 +655,20 @@ group { name: "elm/button/base/hoversel_vertical_entry/default";
          }
          description { state: "visible" 0.0;
             inherit: "default" 0.0;
+            fixed: 1 0;
             visible: 1;
             aspect: 1.0 1.0;
-            aspect_preference: VERTICAL;
+//            aspect_preference: VERTICAL;
             rel2.offset: 0 -3;
          }
          description { state: "icononly" 0.0;
             inherit: "default" 0.0;
+            fixed: 0 0;
             visible: 1;
             align: 0.5 0.5;
-            aspect: 1.0 1.0;
+//            aspect: 1.0 1.0;
             rel2.offset: -5 -5;
-            rel2.relative: 1.0 1.0;
+//            rel2.relative: 1.0 1.0;
             aspect_preference: VERTICAL;
          }
       }

diff --git a/src/bin/test_hoversel.c b/src/bin/test_hoversel.c
index fe02f8e..950e9b0 100644 (file)
--- a/src/bin/test_hoversel.c
+++ b/src/bin/test_hoversel.c
@@ -129,7 +129,7 @@ test_hoversel(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
    elm_hoversel_item_add(bt, "Item 1", NULL, ELM_ICON_NONE, NULL, NULL);
    elm_hoversel_item_add(bt, "Item 2", NULL, ELM_ICON_NONE, NULL, NULL);
    elm_hoversel_item_add(bt, "Item 3", NULL, ELM_ICON_NONE, NULL, NULL);
-   elm_hoversel_item_add(bt, "Item 4 - Long Label Here", NULL, ELM_ICON_NONE, NULL, NULL);
+   elm_hoversel_item_add(bt, "Item 4 - Long Label Here", "close", ELM_ICON_STANDARD, NULL, NULL);
    evas_object_size_hint_weight_set(bt, 0.0, 0.0);
    evas_object_size_hint_align_set(bt, 0.5, 0.5);
    elm_box_pack_end(bx, bt);

diff --git a/src/lib/elm_button.c b/src/lib/elm_button.c
index c35887c..7dbae8a 100644 (file)
--- a/src/lib/elm_button.c
+++ b/src/lib/elm_button.c
@@ -115,6 +115,8 @@ _icon_signal_emit(Evas_Object *obj)
             elm_layout_content_get(obj, "icon") ? "visible" : "hidden");
 
    elm_layout_signal_emit(obj, buf, "elm");
+   edje_object_message_signal_process(elm_layout_edje_get(obj));
+   _elm_button_smart_sizing_eval(obj);
 }
 
 /* FIXME: replicated from elm_layout just because button's icon spot