From 4e5af01dacd2a13dcf01b1a3e239591b59241afa Mon Sep 17 00:00:00 2001 From: Thierry Lorthiois Date: Sun, 8 Aug 2010 14:06:15 +0000 Subject: [PATCH] fixed Issue 282 --- src/battery/battery.c | 1 + src/clock/clock.c | 1 + src/launcher/launcher.c | 1 + src/panel.c | 1 + src/systray/systraybar.c | 1 + src/taskbar/task.c | 2 +- src/taskbar/taskbar.c | 2 ++ src/util/area.c | 70 ++++++++++++++++++++++++++++++---------- 8 files changed, 61 insertions(+), 18 deletions(-) diff --git a/src/battery/battery.c b/src/battery/battery.c index b20b7d3..be64721 100644 --- a/src/battery/battery.c +++ b/src/battery/battery.c @@ -230,6 +230,7 @@ void init_battery_panel(void *p) battery->area.parent = p; battery->area.panel = p; battery->area._draw_foreground = draw_battery; + battery->area.size_mode = SIZE_BY_CONTENT; battery->area._resize = resize_battery; battery->area.resize = 1; battery->area.redraw = 1; diff --git a/src/clock/clock.c b/src/clock/clock.c index af7afe1..af6778e 100644 --- a/src/clock/clock.c +++ b/src/clock/clock.c @@ -149,6 +149,7 @@ void init_clock_panel(void *p) clock->area.parent = p; clock->area.panel = p; clock->area._draw_foreground = draw_clock; + clock->area.size_mode = SIZE_BY_CONTENT; clock->area._resize = resize_clock; clock->area.resize = 1; clock->area.redraw = 1; diff --git a/src/launcher/launcher.c b/src/launcher/launcher.c index 618efa2..83038d0 100644 --- a/src/launcher/launcher.c +++ b/src/launcher/launcher.c @@ -56,6 +56,7 @@ void init_launcher_panel(void *p) launcher->area.parent = p; launcher->area.panel = p; launcher->area._draw_foreground = draw_launcher; + launcher->area.size_mode = SIZE_BY_CONTENT; launcher->area._resize = resize_launcher; launcher->area.resize = 1; launcher->area.redraw = 1; diff --git a/src/panel.c b/src/panel.c index 5ca3afc..5c5ab6a 100644 --- a/src/panel.c +++ b/src/panel.c @@ -163,6 +163,7 @@ void init_panel() p->area.panel = p; p->area.on_screen = 1; p->area.resize = 1; + p->area.size_mode = SIZE_BY_CONTENT; p->area._resize = resize_panel; p->g_taskbar.area.parent = p; p->g_taskbar.area.panel = p; diff --git a/src/systray/systraybar.c b/src/systray/systraybar.c index aec5752..a6fec3a 100644 --- a/src/systray/systraybar.c +++ b/src/systray/systraybar.c @@ -61,6 +61,7 @@ void default_systray() systray.alpha = 100; systray.sort = 3; systray.area._draw_foreground = draw_systray; + systray.area.size_mode = SIZE_BY_CONTENT; systray.area._resize = resize_systray; } diff --git a/src/taskbar/task.c b/src/taskbar/task.c index 921f067..a096af3 100644 --- a/src/taskbar/task.c +++ b/src/taskbar/task.c @@ -221,7 +221,7 @@ void get_icon (Task *tsk) } data = server_get_property (tsk->win, server.atom._NET_WM_ICON, XA_CARDINAL, &i); - if (data) { + if (data && i) { // get ARGB icon int w, h; long *tmp_data; diff --git a/src/taskbar/taskbar.c b/src/taskbar/taskbar.c index 8ba7ac1..7f000ee 100644 --- a/src/taskbar/taskbar.c +++ b/src/taskbar/taskbar.c @@ -75,6 +75,7 @@ void init_taskbar() panel->g_task.area.bg = &g_array_index(backgrounds, Background, 0); // taskbar + panel->g_taskbar.area.size_mode = SIZE_BY_LAYOUT; panel->g_taskbar.area._resize = resize_taskbar; panel->g_taskbar.area.redraw = 1; panel->g_taskbar.area.on_screen = 1; @@ -88,6 +89,7 @@ void init_taskbar() } // task + panel->g_task.area.size_mode = SIZE_BY_LAYOUT; panel->g_task.area._draw_foreground = draw_task; panel->g_task.area.redraw = 1; panel->g_task.area.on_screen = 1; diff --git a/src/util/area.c b/src/util/area.c index 498df86..62adbf0 100644 --- a/src/util/area.c +++ b/src/util/area.c @@ -33,15 +33,12 @@ /* // TODO : layering & drawing loop -1) browse tree and calculate 'size' for SIZE_BY_CONTENT - - SIZE_BY_CONTENT loop calculate child first - - if 'size' changed then 'resize = 1' on the parent (tester resize aprés la boucle) - - size == width on horizontal panel and == height on vertical panel -2) browse tree and calculate 'size' for SIZE_BY_LAYOUT - - SIZE_BY_LAYOUT loop calculate parent first +1) browse tree and resize SIZE_BY_CONTENT node + - children node are resized before its parent + - if 'size' changed then 'resize = 1' on the parent +2) browse tree and resize SIZE_BY_LAYOUT node + - parent node is resized before its children - if 'size' changed then 'resize = 1' on childs with SIZE_BY_LAYOUT - - calculate width = size - somme(child_with_of_SIZE_BY_CONTENT) modulo(number of child_SIZE_BY_LAYOUT) - - calculate modulo = 3) calculate posx of all objects 4) redraw needed objects */ @@ -52,6 +49,7 @@ void refresh (Area *a) if (!a->on_screen) return; size(a); + //size_by_content(a); // don't draw transparent objects (without foreground and without background) if (a->redraw) { @@ -95,6 +93,44 @@ void size (Area *a) } } +// browse tree and resize SIZE_BY_CONTENT node +void size_by_content (Area *a) +{ + // children node are resized before its parent + GSList *l; + for (l = a->list; l ; l = l->next) + size_by_content(l->data); + + // calculate current area's size + if (a->resize && a->size_mode == SIZE_BY_CONTENT) { + a->resize = 0; + + // if 'size' changed then 'resize = 1' on the parent + a->_resize(a); + ((Area*)a->parent)->resize = 1; + } +} + + +// browse tree and resize SIZE_BY_LAYOUT node +void size_by_layout (Area *a) +{ + // parent node is resized before its children + + // calculate current area's size + if (a->resize && a->size_mode == SIZE_BY_LAYOUT) { + a->resize = 0; + + // if 'size' changed then 'resize = 1' on the parent + //if (a->_resize(a)) + //a->parent->resize = 1; + } + + GSList *l; + for (l = a->list; l ; l = l->next) + size_by_layout(l->data); +} + void set_redraw (Area *a) { @@ -148,9 +184,9 @@ void draw_background (Area *a, cairo_t *c) draw_rect(c, a->bg->border.width/2.0, a->bg->border.width/2.0, a->width - a->bg->border.width, a->height - a->bg->border.width, a->bg->border.rounded); /* // convert : radian = degre * M_PI/180 - // définir le dégradé dans un carré de (0,0) (100,100) - // ensuite ce dégradé est extrapolé selon le ratio width/height - // dans repère (0, 0) (100, 100) + // definir le degrade dans un carre de (0,0) (100,100) + // ensuite ce degrade est extrapoler selon le ratio width/height + // dans repere (0, 0) (100, 100) double X0, Y0, X1, Y1, degre; // x = X * (a->width / 100), y = Y * (a->height / 100) double x0, y0, x1, y1; @@ -159,13 +195,13 @@ void draw_background (Area *a, cairo_t *c) X1 = 100; Y1 = 0; degre = 45; - // et ensuite faire la changement d'unité du repère - // car ce qui doit resté inchangée est les traits et pas la direction + // et ensuite faire la changement d'unite du repere + // car ce qui doit reste inchangee est les traits et pas la direction - // il faut d'abord appliquer une rotation de 90° (et -180° si l'angle est supérieur à 180°) - // ceci peut être appliqué une fois pour toute au départ - // ensuite calculer l'angle dans le nouveau repère - // puis faire une rotation de 90° + // il faut d'abord appliquer une rotation de 90 (et -180 si l'angle est superieur a 180) + // ceci peut etre applique une fois pour toute au depart + // ensuite calculer l'angle dans le nouveau repare + // puis faire une rotation de 90 x0 = X0 * ((double)a->width / 100); x1 = X1 * ((double)a->width / 100); y0 = Y0 * ((double)a->height / 100); -- 2.44.0