okra pushed a commit to branch master. http://git.enlightenment.org/apps/ephoto.git/commit/?id=57fd04f34650bb947398da5e1a121389ba01574c
commit 57fd04f34650bb947398da5e1a121389ba01574c Author: Stephen okra Houston <[email protected]> Date: Thu Aug 18 09:12:11 2016 -0500 Ephoto: Fix tooltips causing box to lose sizing. Fixes https://phab.enlightenment.org/T4349 --- src/bin/ephoto_hsv.c | 2 +- src/bin/ephoto_main.c | 4 ++-- src/bin/ephoto_single_browser.c | 7 ++++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/bin/ephoto_hsv.c b/src/bin/ephoto_hsv.c index 1376f58..593b2f2 100644 --- a/src/bin/ephoto_hsv.c +++ b/src/bin/ephoto_hsv.c @@ -354,7 +354,7 @@ ephoto_hsv_add(Ephoto *ephoto, Evas_Object *main, Evas_Object *parent, Evas_Obje "ehsv", ehsv); evas_object_event_callback_add(ehsv->editor, EVAS_CALLBACK_DEL, _editor_del, ehsv); - + slider = elm_slider_add(ehsv->editor); elm_object_text_set(slider, _("Value")); elm_slider_min_max_set(slider, -100, 100); diff --git a/src/bin/ephoto_main.c b/src/bin/ephoto_main.c index 9180fc0..a3702b9 100644 --- a/src/bin/ephoto_main.c +++ b/src/bin/ephoto_main.c @@ -541,7 +541,7 @@ ephoto_window_add(const char *path) elm_object_text_set(but, _("Show Folders")); evas_object_smart_callback_add(but, "clicked", _folder_icon_clicked, ephoto); elm_object_tooltip_text_set(but, _("Show Folders")); - elm_object_tooltip_orient_set(but, ELM_TOOLTIP_ORIENT_RIGHT); + elm_object_tooltip_orient_set(but, ELM_TOOLTIP_ORIENT_TOP); elm_box_pack_end(ephoto->statusbar, but); evas_object_show(but); fold = but; @@ -608,7 +608,7 @@ ephoto_window_add(const char *path) evas_object_smart_callback_add(but, "clicked", _settings_icon_clicked, ephoto); elm_object_tooltip_text_set(but, _("Settings")); - elm_object_tooltip_orient_set(but, ELM_TOOLTIP_ORIENT_LEFT); + elm_object_tooltip_orient_set(but, ELM_TOOLTIP_ORIENT_TOP); elm_box_pack_end(ephoto->statusbar, but); evas_object_show(but); diff --git a/src/bin/ephoto_single_browser.c b/src/bin/ephoto_single_browser.c index 70c01db..acf3868 100644 --- a/src/bin/ephoto_single_browser.c +++ b/src/bin/ephoto_single_browser.c @@ -1129,7 +1129,7 @@ _go_hsv(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) Ephoto_Single_Browser *sb = data; if (sb->viewer) - { + { sb->editing = EINA_TRUE; Ephoto_Viewer *v = evas_object_data_get(sb->viewer, "viewer"); @@ -1570,6 +1570,7 @@ _edit_function_item_add(Evas_Object *parent, const char *icon, const char *label button = elm_button_add(parent); elm_object_tooltip_text_set(button, label); elm_object_tooltip_orient_set(button, ELM_TOOLTIP_ORIENT_LEFT); + elm_object_tooltip_window_mode_set(button, EINA_TRUE); elm_object_part_content_set(button, "icon", ic); evas_object_size_hint_min_set(button, 30*elm_config_scale_get(), 30*elm_config_scale_get()); @@ -2289,7 +2290,7 @@ ephoto_single_browser_show_controls(Ephoto *ephoto) elm_object_part_content_set(but, "icon", ic); elm_object_tooltip_text_set(but, _("Zoom In")); elm_object_tooltip_orient_set(but, ELM_TOOLTIP_ORIENT_TOP); - evas_object_smart_callback_add(but, "clicked", _zoom_in_cb, sb); + evas_object_smart_callback_add(but, "clicked", _zoom_in_cb, sb); elm_box_pack_end(ephoto->controls_left, but); evas_object_show(but); @@ -2321,7 +2322,7 @@ ephoto_single_browser_show_controls(Ephoto *ephoto) elm_object_part_content_set(but, "icon", ic); elm_object_tooltip_text_set(but, _("Zoom Fit")); elm_object_tooltip_orient_set(but, ELM_TOOLTIP_ORIENT_TOP); - evas_object_smart_callback_add(but, "clicked", _zoom_fit_cb, sb); + evas_object_smart_callback_add(but, "clicked", _zoom_fit_cb, sb); elm_box_pack_end(ephoto->controls_left, but); evas_object_show(but); --
