netstar pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=088b1b26c9d159598cdaf061048027ee945b1cfe
commit 088b1b26c9d159598cdaf061048027ee945b1cfe Author: Alastair Poole <[email protected]> Date: Tue Aug 18 21:56:28 2020 +0100 tasks: Add a Live Preview. If it breaks, revert the patch. Try again with another batch... o/ \o/ ??? --- src/modules/tasks/e_mod_config.c | 20 +++++ src/modules/tasks/e_mod_main.c | 158 +++++++++++++++++++++++++++++++++++++++ src/modules/tasks/e_mod_main.h | 2 + 3 files changed, 180 insertions(+) diff --git a/src/modules/tasks/e_mod_config.c b/src/modules/tasks/e_mod_config.c index 361fac8a6..7a32d301f 100644 --- a/src/modules/tasks/e_mod_config.c +++ b/src/modules/tasks/e_mod_config.c @@ -8,6 +8,8 @@ struct _E_Config_Dialog_Data int minw, minh; int icon_only; int text_only; + int preview; + int preview_size; }; /* Protos */ @@ -44,6 +46,8 @@ _fill_data(Config_Item *ci, E_Config_Dialog_Data *cfdata) cfdata->minh = ci->minh; cfdata->icon_only = ci->icon_only; cfdata->text_only = ci->text_only; + cfdata->preview = ci->preview; + cfdata->preview_size = ci->preview_size; } static void * @@ -105,6 +109,20 @@ _basic_create_widgets(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dia e_widget_framelist_object_append(of, ow); _toggle_check(cfdata, NULL); + e_widget_list_object_append(o, of, 1, 1, 0.5); + + e_widget_framelist_object_append(of, ob); + of = e_widget_framelist_add(evas, _("Preview"), 0); + cfdata->icon = ob = e_widget_check_add(evas, _("Show"), + &(cfdata->preview)); + e_widget_framelist_object_append(of, ob); + ow = e_widget_label_add(evas, _("Preview Size")); + e_widget_framelist_object_append(of, ow); + ow = e_widget_slider_add(evas, 1, 0, _("%1.0f px"), 20, 420, 1, 0, + NULL, &(cfdata->preview_size), 100); + e_widget_framelist_object_append(of, ow); + _toggle_check(cfdata, NULL); + e_widget_list_object_append(o, of, 1, 1, 0.5); return o; } @@ -120,6 +138,8 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) ci->minh = cfdata->minh; ci->icon_only = cfdata->icon_only; ci->text_only = cfdata->text_only; + ci->preview = cfdata->preview; + ci->preview_size = cfdata->preview_size; e_config_save_queue(); _tasks_config_updated(ci); return 1; diff --git a/src/modules/tasks/e_mod_main.c b/src/modules/tasks/e_mod_main.c index f7a2dfbd1..2822fcb36 100644 --- a/src/modules/tasks/e_mod_main.c +++ b/src/modules/tasks/e_mod_main.c @@ -47,6 +47,8 @@ struct _Tasks_Item E_Client *client; // The client this item points to Evas_Object *o_item; // The edje theme object Evas_Object *o_icon; // The icon + Evas_Object *o_preview; // The preview + Ecore_Timer *timer; // The preview timer Eina_Bool skip_taskbar E_BITFIELD; Eina_Bool focused E_BITFIELD; Eina_Bool urgent E_BITFIELD; @@ -69,6 +71,8 @@ static void _tasks_item_refill(Tasks_Item *item); static void _tasks_item_fill(Tasks_Item *item); static void _tasks_item_free(Tasks_Item *item); static void _tasks_item_signal_emit(Tasks_Item *item, char *sig, char *src); +static void _tasks_item_preview_add(Tasks_Item *item); +static void _tasks_item_preview_del(Tasks_Item *item); static Config_Item *_tasks_config_item_get(const char *id); @@ -76,6 +80,8 @@ static void _tasks_cb_menu_configure(void *data, E_Menu *m, E_Menu_Item static void _tasks_cb_item_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info); static void _tasks_cb_item_mouse_up(void *data, Evas *e, Evas_Object *obj, void *event_info); static void _tasks_cb_item_mouse_wheel(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info); +static void _tasks_cb_item_mouse_in(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info); +static void _tasks_cb_item_mouse_out(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info); static Eina_Bool _tasks_cb_event_client_add(void *data, int type, void *event); static Eina_Bool _tasks_cb_event_client_remove(void *data, int type, void *event); @@ -87,6 +93,7 @@ static Eina_Bool _tasks_cb_event_client_desk_set(void *data, int type, E_Even static Eina_Bool _tasks_cb_window_focus_in(void *data, int type, void *event); static Eina_Bool _tasks_cb_window_focus_out(void *data, int type, void *event); static Eina_Bool _tasks_cb_event_desk_show(void *data, int type, void *event); +static Eina_Bool _tasks_cb_timer_del(void *data); static E_Config_DD *conf_edd = NULL; static E_Config_DD *conf_item_edd = NULL; @@ -115,8 +122,10 @@ e_modapi_init(E_Module *m) E_CONFIG_VAL(D, T, show_all, INT); E_CONFIG_VAL(D, T, minw, INT); E_CONFIG_VAL(D, T, minh, INT); + E_CONFIG_VAL(D, T, preview_size, INT); E_CONFIG_VAL(D, T, icon_only, UCHAR); E_CONFIG_VAL(D, T, text_only, UCHAR); + E_CONFIG_VAL(D, T, preview, UCHAR); conf_edd = E_CONFIG_DD_NEW("Tasks_Config", Config); @@ -138,6 +147,8 @@ e_modapi_init(E_Module *m) config->show_all = 0; config->minw = 100; config->minh = 32; + config->preview = 0; + config->preview_size = 32; tasks_config->items = eina_list_append(tasks_config->items, config); } @@ -569,6 +580,10 @@ _tasks_item_new(Tasks *tasks, E_Client *ec) _tasks_cb_item_mouse_up, item); evas_object_event_callback_add(item->o_item, EVAS_CALLBACK_MOUSE_WHEEL, _tasks_cb_item_mouse_wheel, item); + evas_object_event_callback_add(item->o_item, EVAS_CALLBACK_MOUSE_IN, + _tasks_cb_item_mouse_in, item); + evas_object_event_callback_add(item->o_item, EVAS_CALLBACK_MOUSE_OUT, + _tasks_cb_item_mouse_out, item); evas_object_show(item->o_item); _tasks_item_fill(item); @@ -614,6 +629,12 @@ _tasks_item_remove(Tasks_Item *item) _tasks_item_free(item); } +static void +_tasks_item_preview_del(Tasks_Item *item) +{ + _tasks_cb_timer_del(item); +} + static void _tasks_item_free(Tasks_Item *item) { @@ -621,6 +642,7 @@ _tasks_item_free(Tasks_Item *item) if (e_object_is_del(E_OBJECT(item->client))) item->tasks->clients = eina_list_remove(item->tasks->clients, item->client); e_object_unref(E_OBJECT(item->client)); + _tasks_item_preview_del(item); evas_object_del(item->o_item); free(item); } @@ -792,6 +814,9 @@ _tasks_cb_item_mouse_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA item = (Tasks_Item *)data; ev = event_info; + + _tasks_item_preview_del(item); + if (ev->button == 3) { E_Menu *m; @@ -831,6 +856,136 @@ _tasks_cb_item_mouse_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA } } +static Eina_Bool +_tasks_cb_timer_del(void *data) +{ + Tasks_Item *item = data; + + evas_object_del(item->o_preview); + if (item->timer) + ecore_timer_del(item->timer); + item->timer = item->o_preview = NULL; + + return ECORE_CALLBACK_CANCEL; +} + +static void +_tasks_item_preview_add(Tasks_Item *item) +{ + Evas_Object *o, *ot, *or, *img; + Evas_Coord ox, oy, ow, oh, size; + double n; + + if (item->o_preview) _tasks_cb_timer_del(item); + + evas_object_geometry_get(item->o_item, &ox, &oy, &ow, &oh); + + item->o_preview = o = elm_ctxpopup_add(e_comp->elm); + elm_object_style_set(o, "noblock"); + evas_object_layer_set(o, E_LAYER_POPUP); + + ot = elm_table_add(o); + evas_object_size_hint_align_set(ot, 0, 0); + elm_object_content_set(o, ot); + evas_object_show(ot); + + img = e_comp_object_util_mirror_add(item->client->frame); + evas_object_size_hint_aspect_set(img, EVAS_ASPECT_CONTROL_BOTH, item->client->w, item->client->h); + evas_object_show(img); + + size = item->tasks->config->preview_size; + if (item->client->w > item->client->h) + { + n = size * (1.0 / item->client->w); + evas_object_size_hint_min_set(img, size, n * item->client->h); + evas_object_size_hint_max_set(img, size, n * item->client->h); + } + else + { + n = size * (1.0 / item->client->h); + evas_object_size_hint_min_set(img, n * item->client->w, size); + evas_object_size_hint_max_set(img, n * item->client->w, size); + } + + or = evas_object_rectangle_add(evas_object_evas_get(o)); + evas_object_size_hint_min_set(or, size + 10, size + 10); + evas_object_color_set(or, 47, 153, 255, 255); + evas_object_show(or); + elm_table_pack(ot, or, 0, 0, 1, 1); + elm_table_pack(ot, img, 0, 0, 1, 1); + + switch (item->tasks->gcc->gadcon->orient) + { + case E_GADCON_ORIENT_BOTTOM: + case E_GADCON_ORIENT_CORNER_BR: + case E_GADCON_ORIENT_CORNER_BL: + evas_object_move(o, ox + (ow / 2), oy); + elm_ctxpopup_direction_priority_set(o, ELM_CTXPOPUP_DIRECTION_UP, ELM_CTXPOPUP_DIRECTION_DOWN, + ELM_CTXPOPUP_DIRECTION_LEFT, ELM_CTXPOPUP_DIRECTION_RIGHT); + break; + case E_GADCON_ORIENT_TOP: + case E_GADCON_ORIENT_CORNER_TL: + case E_GADCON_ORIENT_CORNER_TR: + evas_object_move(o, ox + (ow / 2), oy + oh); + elm_ctxpopup_direction_priority_set(o, ELM_CTXPOPUP_DIRECTION_DOWN, ELM_CTXPOPUP_DIRECTION_UP, + ELM_CTXPOPUP_DIRECTION_LEFT, ELM_CTXPOPUP_DIRECTION_RIGHT); + break; + case E_GADCON_ORIENT_LEFT: + case E_GADCON_ORIENT_CORNER_LB: + case E_GADCON_ORIENT_CORNER_LT: + evas_object_move(o, ox + ow, oy + (oh / 2)); + elm_ctxpopup_direction_priority_set(o, ELM_CTXPOPUP_DIRECTION_RIGHT, ELM_CTXPOPUP_DIRECTION_DOWN, + ELM_CTXPOPUP_DIRECTION_LEFT, ELM_CTXPOPUP_DIRECTION_UP); + break; + case E_GADCON_ORIENT_RIGHT: + case E_GADCON_ORIENT_CORNER_RB: + case E_GADCON_ORIENT_CORNER_RT: + evas_object_move(o, ox, oy + (oh / 2)); + elm_ctxpopup_direction_priority_set(o, ELM_CTXPOPUP_DIRECTION_LEFT, ELM_CTXPOPUP_DIRECTION_DOWN, + ELM_CTXPOPUP_DIRECTION_RIGHT, ELM_CTXPOPUP_DIRECTION_UP); + break; + default: + break; + } + evas_object_show(o); +} + +static void +_tasks_cb_item_mouse_in(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) +{ + Tasks_Item *item; + E_Client *ec; + + item = data; + + if (!item->tasks->config->preview) return; + + ec = e_client_focused_get(); + + _tasks_item_preview_add(item); + + if (ec) + evas_object_focus_set(ec->frame, 1); +} + +static void +_tasks_cb_item_mouse_out(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) +{ + Tasks_Item *item; + E_Client *ec = e_client_focused_get(); + + item = data; + + if (item->o_preview) + { + elm_ctxpopup_dismiss(item->o_preview); + item->timer = ecore_timer_add(1.0, _tasks_cb_timer_del, item); + } + + if (ec) + evas_object_focus_set(ec->frame, 1); +} + static void _tasks_cb_item_mouse_wheel(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info) { @@ -860,6 +1015,9 @@ _tasks_cb_item_mouse_up(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_U ev = event_info; item = data; + + _tasks_item_preview_del(item); + if (ev->button == 1) { if (!item->client->sticky && item->tasks->config->show_all) diff --git a/src/modules/tasks/e_mod_main.h b/src/modules/tasks/e_mod_main.h index d6258ed2c..cc412e9d0 100644 --- a/src/modules/tasks/e_mod_main.h +++ b/src/modules/tasks/e_mod_main.h @@ -20,8 +20,10 @@ struct _Config_Item const char *id; int show_all; int minw, minh; + int preview_size; Eina_Bool icon_only; Eina_Bool text_only; + Eina_Bool preview; }; E_API extern E_Module_Api e_modapi; --
