rvandegrift
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

systray - fix sizing to use gadget size not shelf/parent for icon 

the sizing in systray is a bit... nadff. quick and dirty fix.

@fix
This commit is contained in:
Carsten Haitzler 2021-02-09 22:04:48 +00:00
parent 15e1519d64
commit 490e46bfa9
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/modules/systray/e_mod_main.c
View File

@ -9,8 +9,8 @@ static E_Module *systray_mod = NULL;
static Systray_Context *ctx = NULL;
static char tmpbuf[4096]; /* general purpose buffer, just use immediately */
#define SYSTRAY_MIN_W 16
#define SYSTRAY_MIN_H 8
#define SYSTRAY_MIN_W 4
#define SYSTRAY_MIN_H 4
static Eina_Bool
_systray_site_is_safe(E_Gadcon_Site site)

24
src/modules/systray/e_mod_notifier_host.c
View File

@ -294,11 +294,13 @@ image_scale(Instance_Notifier_Host *notifier_inst, Notifier_Item_Icon *ii)
case E_GADCON_ORIENT_CORNER_TR:
case E_GADCON_ORIENT_CORNER_BL:
case E_GADCON_ORIENT_CORNER_BR:
if (systray_gadcon_get(notifier_inst->inst)->shelf)
sz = systray_gadcon_get(notifier_inst->inst)->shelf->h;
else
evas_object_geometry_get(notifier_inst->inst->gcc->o_frame ?:
notifier_inst->inst->gcc->o_base, NULL, NULL, NULL, &sz);
// if (systray_gadcon_get(notifier_inst->inst)->shelf)
// sz = systray_gadcon_get(notifier_inst->inst)->shelf->h;
// else
// evas_object_geometry_get(notifier_inst->inst->gcc->o_frame ?:
// notifier_inst->inst->gcc->o_base, NULL, NULL, NULL, &sz);
evas_object_geometry_get(notifier_inst->inst->ui.gadget,
NULL, NULL, NULL, &sz);
break;
case E_GADCON_ORIENT_VERT:
@ -309,11 +311,13 @@ image_scale(Instance_Notifier_Host *notifier_inst, Notifier_Item_Icon *ii)
case E_GADCON_ORIENT_CORNER_LB:
case E_GADCON_ORIENT_CORNER_RB:
default:
if (systray_gadcon_get(notifier_inst->inst)->shelf)
sz = systray_gadcon_get(notifier_inst->inst)->shelf->w;
else
evas_object_geometry_get(notifier_inst->inst->gcc->o_frame ?:
notifier_inst->inst->gcc->o_base, NULL, NULL, &sz, NULL);
// if (systray_gadcon_get(notifier_inst->inst)->shelf)
// sz = systray_gadcon_get(notifier_inst->inst)->shelf->w;
// else
// evas_object_geometry_get(notifier_inst->inst->gcc->o_frame ?:
// notifier_inst->inst->gcc->o_base, NULL, NULL, &sz, NULL);
evas_object_geometry_get(notifier_inst->inst->ui.gadget,
NULL, NULL, &sz, NULL);
break;
}
sz = sz - 5;