raster pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=dfc83aeb79c6e9d773d48c68709ed762edad6363
commit dfc83aeb79c6e9d773d48c68709ed762edad6363
Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com>
Date: Thu Nov 5 19:43:56 2020 +0000
winlist - handle size and border/shadow chages on the fly while visible
---
src/bin/e_comp_object.c | 108 ++++++++++++++++++++++++++++++++++------
src/modules/winlist/e_winlist.c | 25 ++++++----
2 files changed, 108 insertions(+), 25 deletions(-)
diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c
index a30af91e1..8a3b88bec 100644
--- a/src/bin/e_comp_object.c
+++ b/src/bin/e_comp_object.c
@@ -4310,26 +4310,102 @@ _e_comp_object_frame_mirror_resize_cb(void *data
EINA_UNUSED, Evas *e EINA_UNUSE
}
static void
-_e_comp_object_frame_mirror_src_resize_cb(void *data, Evas *e EINA_UNUSED,
Evas_Object *obj, void *info EINA_UNUSED)
+_e_comp_object_frame_mirror_src_frame_resize_cb(void *data, Evas_Object *obj,
void *info EINA_UNUSED)
{
Evas_Object *o = data;
Evas_Object *o_zoomap;
- E_Client *ec = evas_object_data_get(o, "ec");
- if (!ec) return;
- o_zoomap = evas_object_data_get(obj, "zoomap");
+
+ API_ENTRY;
+
+ o_zoomap = evas_object_data_get(o, "zoomap");
if (!o_zoomap) return;
- e_zoomap_child_resize(o_zoomap, ec->w, ec->h);
+ e_zoomap_child_resize(o_zoomap, cw->ec->w, cw->ec->h);
+}
+
+static void
+_e_comp_object_frame_mirror_src_frame_shadow_changed_cb(void *data,
Evas_Object *obj, void *info EINA_UNUSED)
+{
+ Evas_Object *o, *o_frame, *o_client, *o_zoomap, *o_sh = data;
+ const char *file = NULL, *group = NULL;
+
+ API_ENTRY;
+
+ o_frame = evas_object_data_get(o_sh, "frame");
+ o_client = evas_object_data_get(o_sh, "client");
+ o_zoomap = evas_object_data_get(o_sh, "zoomap");
+
+ edje_object_file_get(cw->shobj, &file, &group);
+ edje_object_file_set(o_sh, file, group);
+ evas_object_data_del(o_sh, "shadow_off");
+ evas_object_data_del(o_sh, "shadow_on");
+ if (e_client_util_shadow_state_get(cw->ec))
+ {
+ evas_object_data_set(o_sh, "do_shadow", o_sh);
+ edje_object_signal_emit(o_sh, "e,state,shadow,on", "e");
+ }
+ else
+ {
+ evas_object_data_del(o_sh, "do_shadow");
+ edje_object_signal_emit(o_sh, "e,state,shadow,off", "e");
+ }
+ edje_object_signal_emit(o_sh, "e,state,visible", "e");
+
+ edje_object_file_get(cw->frame_object, &file, &group);
+ if ((file) && (group))
+ {
+ if (!o_zoomap)
+ {
+ o = o_zoomap = e_zoomap_add(e_comp->evas);
+ evas_object_data_set(o_sh, "zoomap", o);
+ e_zoomap_smooth_set(o, e_comp_config_get()->smooth_windows);
+ edje_object_part_swallow(o_sh, "e.swallow.content", o);
+ evas_object_show(o);
+ }
+
+ if (!o_frame)
+ {
+ o = o_frame = edje_object_add(e_comp->evas);
+ evas_object_data_set(o_sh, "frame", o);
+ edje_object_file_set(o, file, group);
+ e_zoomap_child_set(o_zoomap, o);
+ e_zoomap_solid_set(o, EINA_FALSE);
+ evas_object_show(o);
+ }
+ edje_object_file_set(o_frame, file, group);
+ edje_object_signal_emit(o_frame, "e,version,22", "e");
+ edje_object_signal_emit(o_frame, "e,state,focused", "e");
+ edje_object_signal_emit(o_frame, "e,state,visible", "e");
+ edje_object_part_text_set(o_frame, "e.text.title", cw->frame_name);
+ }
+ else
+ {
+ o = evas_object_data_get(o_sh, "frame");
+ if (o) evas_object_del(o);
+ evas_object_data_del(o_sh, "frame");
+
+ o = evas_object_data_get(o_sh, "zoomap");
+ if (o) evas_object_del(o);
+ evas_object_data_del(o_sh, "zoomap");
+ }
+
+ if (o_frame) edje_object_part_swallow(o_frame, "e.swallow.client",
o_client);
+ else edje_object_part_swallow(o_sh, "e.swallow.content",
o_client);
+ evas_object_show(o_client);
}
static void
_e_comp_object_frame_mirror_del_cb(void *data EINA_UNUSED, Evas *e
EINA_UNUSED, Evas_Object *obj, void *info EINA_UNUSED)
{
- E_Client *ec;
Evas_Object *o;
- ec = evas_object_data_get(obj, "ec");
- if (ec)
- evas_object_event_callback_del_full(ec->frame, EVAS_CALLBACK_RESIZE,
_e_comp_object_frame_mirror_src_resize_cb, obj);
+ o = evas_object_data_get(obj, "comp_obj");
+ if (o)
+ {
+ evas_object_smart_callback_del_full(o, "frame_changed",
_e_comp_object_frame_mirror_src_frame_shadow_changed_cb, obj);
+ evas_object_smart_callback_del_full(o, "shadow_change",
_e_comp_object_frame_mirror_src_frame_shadow_changed_cb, obj);
+ evas_object_smart_callback_del_full(o, "client_resize",
_e_comp_object_frame_mirror_src_frame_resize_cb, obj);
+ }
+
o = evas_object_data_get(obj, "client");
if (o) evas_object_del(o);
evas_object_data_del(obj, "client");
@@ -4356,7 +4432,7 @@ e_comp_object_util_frame_mirror_add(Evas_Object *obj)
API_ENTRY NULL;
o = o_sh = edje_object_add(e_comp->evas);
- evas_object_data_set(o_sh, "ec", cw->ec);
+ evas_object_data_set(o, "ec", cw->ec);
edje_object_file_get(cw->shobj, &file, &group);
edje_object_file_set(o, file, group);
if (e_client_util_shadow_state_get(cw->ec))
@@ -4404,12 +4480,12 @@ e_comp_object_util_frame_mirror_add(Evas_Object *obj)
evas_object_show(o);
}
- evas_object_event_callback_add(o_sh, EVAS_CALLBACK_DEL,
- _e_comp_object_frame_mirror_del_cb, NULL);
- evas_object_event_callback_add(o_sh, EVAS_CALLBACK_RESIZE,
- _e_comp_object_frame_mirror_resize_cb, NULL);
- evas_object_event_callback_add(cw->ec->frame, EVAS_CALLBACK_RESIZE,
- _e_comp_object_frame_mirror_src_resize_cb,
o_sh);
+ evas_object_event_callback_add(o_sh, EVAS_CALLBACK_DEL,
_e_comp_object_frame_mirror_del_cb, NULL);
+ evas_object_event_callback_add(o_sh, EVAS_CALLBACK_RESIZE,
_e_comp_object_frame_mirror_resize_cb, NULL);
+ evas_object_data_set(o_sh, "comp_obj", obj);
+ evas_object_smart_callback_add(obj, "frame_changed",
_e_comp_object_frame_mirror_src_frame_shadow_changed_cb, o_sh);
+ evas_object_smart_callback_add(obj, "shadow_change",
_e_comp_object_frame_mirror_src_frame_shadow_changed_cb, o_sh);
+ evas_object_smart_callback_add(obj, "client_resize",
_e_comp_object_frame_mirror_src_frame_resize_cb, o_sh);
if (o_zoomap)
e_zoomap_child_resize(o_zoomap, cw->ec->w, cw->ec->h);
return o_sh;
diff --git a/src/modules/winlist/e_winlist.c b/src/modules/winlist/e_winlist.c
index a8d70e1e9..6a3423a24 100644
--- a/src/modules/winlist/e_winlist.c
+++ b/src/modules/winlist/e_winlist.c
@@ -19,7 +19,7 @@ struct _E_Winlist_Win
unsigned char was_shaded E_BITFIELD;
};
-static void _e_winlist_client_resize_cb(void *data, Evas *e EINA_UNUSED,
Evas_Object *obj EINA_UNUSED, void *info EINA_UNUSED);
+static void _e_winlist_client_resize_cb(void *data, Evas_Object *obj,
void *info);
static void _e_winlist_size_adjust(void);
static Eina_Bool _e_winlist_client_add(E_Client *ec, E_Zone *zone, E_Desk
*desk);
static void _e_winlist_client_del(E_Client *ec);
@@ -66,7 +66,6 @@ static double _scroll_align = 0.0;
static Ecore_Timer *_scroll_timer = NULL;
static Ecore_Animator *_animator = NULL;
static Eina_Bool _mouse_pressed = EINA_FALSE;
-static Evas_Coord _winlist_chosen_h = 0;
static Eina_Bool
_wmclass_picked(const Eina_List *lst, const char *wmclass)
@@ -321,7 +320,7 @@ e_winlist_hide(void)
EINA_LIST_FREE(_wins, ww)
{
if (ww->client->frame)
- evas_object_event_callback_del_full(ww->client->frame,
EVAS_CALLBACK_RESIZE,
+ evas_object_smart_callback_del_full(ww->client->frame,
"client_resize",
_e_winlist_client_resize_cb, ww);
if ((!ec) || (ww->client != ec)) e_object_unref(E_OBJECT(ww->client));
free(ww);
@@ -753,6 +752,7 @@ _e_winlist_large_item_height_set(Evas_Coord h)
}
bl = elm_box_children_get(_list_object);
if (!bl) return 0;
+// printf("W: fit %ix%i\n", lw, lh);
EINA_LIST_FOREACH(_wins, l, ww)
{
try_again:
@@ -769,25 +769,30 @@ try_again:
edje_object_part_swallow(ww->bg_object, "e.swallow.win",
ww->win_object);
edje_object_size_min_calc(ww->bg_object, &mw, &mh);
evas_object_size_hint_min_set(ww->bg_object, mw, mh);
+// printf("W: orig=[%ix%i] win=%ix%i | ", ww->client->w, ww->client->h,
mw, mh);
box = bl->data;
elm_box_pack_end(box, ww->bg_object);
evas_smart_objects_calculate(evas_object_evas_get(box));
evas_object_size_hint_min_get(box, &mw, &mh);
// if box is too big then reflow obj onto next box row
+// printf("box=%ix%i", mw, mh);
if (mw > lw)
{
+// printf(" newrow\n");
boxes = elm_box_children_get(bl->data);
if (!boxes) break;
+ // no more boxes to fill? break the loop trying - should not
happen
bl = bl->next;
if (!bl) break;
rows++;
+ // if only item on the row - continue adding more items
if (eina_list_count(boxes) == 1) continue;
// unpack from prev box as we are going to try with a new row
elm_box_unpack(box, ww->bg_object);
goto try_again;
}
+// printf("\n");
}
- _winlist_chosen_h = h;
return rows;
}
@@ -853,12 +858,14 @@ _e_winlist_size_large_adjust(void)
}
}
evas_smart_objects_calculate(evas_object_evas_get(_bg_object));
+ edje_object_part_swallow(_bg_object, "e.swallow.list", _list_object);
edje_object_size_min_calc(_bg_object, &mw, &mh);
w = mw;
h = mh;
x = zone->x + ((zone->w - w) / 2);
y = zone->y + ((zone->h - h) / 2);
+ evas_object_geometry_set(_winlist, -1, -1, 1, 1);
evas_object_geometry_set(_winlist, x, y, w, h);
}
@@ -870,13 +877,13 @@ _e_winlist_size_adjust(void)
}
static void
-_e_winlist_client_resize_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *info EINA_UNUSED)
+_e_winlist_client_resize_cb(void *data, Evas_Object *obj EINA_UNUSED, void
*info EINA_UNUSED)
{
E_Winlist_Win *ww = data;
if (e_config->winlist_mode == 1)
{
- _e_winlist_large_item_height_set(_winlist_chosen_h);
+ _e_winlist_size_large_adjust();
}
else
{
@@ -1009,7 +1016,7 @@ _e_winlist_client_add(E_Client *ec, E_Zone *zone, E_Desk
*desk)
evas_object_size_hint_max_set(ww->bg_object, 9999, mh);
elm_box_pack_end(_list_object, ww->bg_object);
}
- evas_object_event_callback_add(ww->client->frame, EVAS_CALLBACK_RESIZE,
+ evas_object_smart_callback_add(ww->client->frame, "client_resize",
_e_winlist_client_resize_cb, ww);
e_object_ref(E_OBJECT(ww->client));
return EINA_TRUE;
@@ -1027,7 +1034,7 @@ _e_winlist_client_del(E_Client *ec)
if (ww->client == ec)
{
if (ec->frame)
- evas_object_event_callback_del_full(ec->frame,
EVAS_CALLBACK_RESIZE,
+ evas_object_smart_callback_del_full(ec->frame, "client_resize",
_e_winlist_client_resize_cb, ww);
e_object_unref(E_OBJECT(ww->client));
if (l == _win_selected)
@@ -1650,7 +1657,7 @@ _e_winlist_animator(void *data EINA_UNUSED)
_scroll_to = 0;
}
// e_config->winlist_mode
- elm_box_align_set(_list_object, 0.5, fabs(1.0 - _scroll_align));
+// elm_box_align_set(_list_object, 0.5, fabs(1.0 - _scroll_align));
}
if (!_scroll_to) _animator = NULL;
return _scroll_to;
--
