okra pushed a commit to branch master. http://git.enlightenment.org/apps/ephoto.git/commit/?id=dc07a9f6bd538c6ecf791e533f2357da00bc2457
commit dc07a9f6bd538c6ecf791e533f2357da00bc2457 Author: Stephen Houston <[email protected]> Date: Sun Jan 25 14:51:40 2015 -0600 Ephoto: Make single browser info label same size as thumb browser. Align thumb toolbar top. --- src/bin/ephoto.h | 1 + src/bin/ephoto_single_browser.c | 9 +++++++++ src/bin/ephoto_thumb_browser.c | 2 ++ 3 files changed, 12 insertions(+) diff --git a/src/bin/ephoto.h b/src/bin/ephoto.h index ad5d3e8..c2d4973 100644 --- a/src/bin/ephoto.h +++ b/src/bin/ephoto.h @@ -120,6 +120,7 @@ struct _Ephoto Eina_List *thumbs; /* live thumbs that need to be regenerated on changes */ int thumb_gen_size; /* pending value for thumb_regen */ + Evas_Coord bottom_bar_size; struct { Ecore_Timer *thumb_regen; } timer; diff --git a/src/bin/ephoto_single_browser.c b/src/bin/ephoto_single_browser.c index 1fc27c2..0160a83 100644 --- a/src/bin/ephoto_single_browser.c +++ b/src/bin/ephoto_single_browser.c @@ -488,6 +488,7 @@ _ephoto_single_browser_recalc(Ephoto_Single_Browser *sb) char image_info[PATH_MAX]; char isize[PATH_MAX]; Evas_Coord w, h; + Evas_Object *botbox; Ephoto_Viewer *v = evas_object_data_get(sb->viewer, "viewer"); Eina_File *f = eina_file_open(sb->entry->path, EINA_FALSE); size_t size = eina_file_size_get(f); @@ -525,6 +526,14 @@ _ephoto_single_browser_recalc(Ephoto_Single_Browser *sb) evas_object_event_callback_add (sb->viewer, EVAS_CALLBACK_MOUSE_WHEEL, _mouse_wheel, sb); + botbox = evas_object_rectangle_add(evas_object_evas_get(sb->table)); + evas_object_color_set(botbox, 255, 255, 255, 0); + evas_object_size_hint_min_set(botbox, 0, sb->ephoto->bottom_bar_size); + evas_object_size_hint_weight_set(botbox, EVAS_HINT_EXPAND, 0.0); + evas_object_size_hint_fill_set(botbox, EVAS_HINT_FILL, EVAS_HINT_FILL); + elm_table_pack(sb->table, botbox, 0, 2, 4, 1); + evas_object_show(botbox); + sb->infolabel = elm_label_add(sb->table); elm_label_line_wrap_set(sb->infolabel, ELM_WRAP_NONE); elm_object_text_set(sb->infolabel, image_info); diff --git a/src/bin/ephoto_thumb_browser.c b/src/bin/ephoto_thumb_browser.c index 8276ce0..da8ebc4 100644 --- a/src/bin/ephoto_thumb_browser.c +++ b/src/bin/ephoto_thumb_browser.c @@ -389,6 +389,7 @@ _ephoto_dir_hide_folders(void *data, Evas_Object *o EINA_UNUSED, void *event_inf elm_toolbar_homogeneous_set(tb->vbar, EINA_TRUE); elm_toolbar_shrink_mode_set(tb->vbar, ELM_TOOLBAR_SHRINK_NONE); elm_toolbar_select_mode_set(tb->vbar, ELM_OBJECT_SELECT_MODE_NONE); + elm_toolbar_align_set(tb->vbar, 0.0); evas_object_size_hint_weight_set(tb->vbar, 0.0, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(tb->vbar, EVAS_HINT_FILL, EVAS_HINT_FILL); @@ -877,6 +878,7 @@ ephoto_thumb_browser_add(Ephoto *ephoto, Evas_Object *parent) elm_box_pack_end(tb->leftbox, but); evas_object_show(but); evas_object_size_hint_min_get(but, 0, &h); + tb->ephoto->bottom_bar_size = h; tb->table = elm_table_add(tb->main); evas_object_size_hint_weight_set(tb->table, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); --
