}
/* register outline */
- ao = _elm_access_edje_object_part_object_register
- (obj, ELM_WIDGET_DATA(sd)->resize_obj, ACCESS_BASE_PART);
- _elm_access_text_set(_elm_access_object_get(ao),
- ELM_ACCESS_TYPE, E_(OUTLINE_TEXT));
- _elm_access_activate_callback_set
- (_elm_access_object_get(ao), _access_base_activate_cb, obj);
+ if (!sd->button_count)
+ {
+ ao = _elm_access_edje_object_part_object_register
+ (obj, ELM_WIDGET_DATA(sd)->resize_obj, ACCESS_BASE_PART);
+ _elm_access_text_set(_elm_access_object_get(ao),
+ ELM_ACCESS_TYPE, E_(OUTLINE_TEXT));
+ _elm_access_activate_callback_set
+ (_elm_access_object_get(ao), _access_base_activate_cb, obj);
+ }
}
else
{
}
/* unregister outline */
- _elm_access_edje_object_part_object_unregister
- (obj, ELM_WIDGET_DATA(sd)->resize_obj, ACCESS_BASE_PART);
+ if (!sd->button_count)
+ _elm_access_edje_object_part_object_unregister
+ (obj, ELM_WIDGET_DATA(sd)->resize_obj, ACCESS_BASE_PART);
}
}
int i = 0;
Action_Area_Data *adata;
char buf[128];
+ Evas_Object *ao;
ELM_POPUP_DATA_GET(obj, sd);
sd->no_shift = EINA_FALSE;
}
+ if (_elm_config->access_mode)
+ {
+ /* if popup has a button, popup should be closed by the button
+ so outline(ACCESS_BASE_PART) is not necessary any more */
+ ao = _access_object_get(obj, ACCESS_BASE_PART);
+
+ if (ao && sd->button_count)
+ _elm_access_edje_object_part_object_unregister
+ (obj, ELM_WIDGET_DATA(sd)->resize_obj, ACCESS_BASE_PART);
+ }
+
snprintf(buf, sizeof(buf), "buttons%u", sd->button_count);
elm_layout_theme_set
(sd->action_area, "popup", buf, elm_widget_style_get(obj));