revert some code from r561 (generic resize function)

[chaz/tint2] / src / panel.c

diff --git a/src/panel.c b/src/panel.c
index 797b96a2c11f8bcca73e7f99037660b001dce01a..7e21f86371100871d61ac51c7ac57d1fdb5db46a 100644 (file)
--- 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;
@@ -219,9 +219,10 @@ void init_panel()
 
                if (panel_autohide)
                        add_timeout(panel_autohide_hide_timeout, 0, autohide_hide, p);
+               
+               visible_taskbar(p);
        }
 
-       visible_object();
        task_refresh_tasklist();
        active_task();
 }
@@ -301,29 +302,26 @@ void init_panel_size_and_position(Panel *panel)
 }
 
 
-void visible_object()
-{
-       Panel *panel;
-       int i, j;
-
-       for (i=0 ; i < nb_panel ; i++) {
-               panel = &panel1[i];
-
-               Taskbar *taskbar;
-               for (j=0 ; j < panel->nb_desktop ; j++) {
-                       taskbar = &panel->taskbar[j];
-                       if (panel_mode != MULTI_DESKTOP && taskbar->desktop != server.desktop) {
-                               // SINGLE_DESKTOP and not current desktop
-                               taskbar->area.on_screen = 0;
-                       }
-                       else {
-                               taskbar->area.on_screen = 1;
-                       }
+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;
                }
        }
-       panel_refresh = 1;
+       return ret;
 }
 
+
 void update_strut(Panel* p)
 {
        if (panel_strut_policy == STRUT_NONE) {