From bfc74d2e0eccdf838ab14a1e3843374ee0848038 Mon Sep 17 00:00:00 2001 From: Thierry Lorthiois Date: Fri, 24 Sep 2010 19:16:55 +0000 Subject: [PATCH] revert some code from r561 (generic resize function) --- src/panel.c | 22 +++++++++++++++++++++- src/panel.h | 1 + 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/src/panel.c b/src/panel.c index 6a98a26..7e21f86 100644 --- a/src/panel.c +++ b/src/panel.c @@ -168,7 +168,7 @@ void init_panel() p->area.on_screen = 1; p->area.resize = 1; p->area.size_mode = SIZE_BY_LAYOUT; - p->area._resize = resize_by_layout; + p->area._resize = resize_panel; p->g_taskbar.area.parent = p; p->g_taskbar.area.panel = p; p->g_task.area.panel = p; @@ -302,6 +302,26 @@ void init_panel_size_and_position(Panel *panel) } +int resize_panel(void *obj) +{ + int ret = resize_by_layout(obj); + + if (panel_mode != MULTI_DESKTOP) { + // propagate width/height on hidden taskbar + int i, width, height; + Panel *panel = (Panel*)obj; + width = panel->taskbar[server.desktop].area.width; + height = panel->taskbar[server.desktop].area.height; + for (i=0 ; i < panel->nb_desktop ; i++) { + panel->taskbar[i].area.width = width; + panel->taskbar[i].area.height = height; + panel->taskbar[i].area.resize = 1; + } + } + return ret; +} + + void update_strut(Panel* p) { if (panel_strut_policy == STRUT_NONE) { diff --git a/src/panel.h b/src/panel.h index 8336666..a2b7f14 100644 --- a/src/panel.h +++ b/src/panel.h @@ -135,6 +135,7 @@ void cleanup_panel(); void init_panel(); void init_panel_size_and_position(Panel *panel); +int resize_panel(void *obj); void set_panel_items_order(Panel *p); void set_panel_properties(Panel *p); -- 2.45.2