some tint2conf code

[chaz/tint2] / src / taskbar / taskbar.c

diff --git a/src/taskbar/taskbar.c b/src/taskbar/taskbar.c
index 89da2a85fba19294d2be42c35abc3d93c84e83a7..5619aa8eee044cd3d5899de8865fb2e133f55d85 100644 (file)
--- a/src/taskbar/taskbar.c
+++ b/src/taskbar/taskbar.c
@@ -72,7 +72,7 @@ void init_taskbar()
                else {
                        panel->g_task.area.posx = panel->g_taskbar.posx + panel->g_taskbar.pix.border.width + panel->g_taskbar.paddingy;
                        panel->g_task.area.width = panel->area.width - (2 * panel->g_task.area.posx);
-                       panel->g_task.area.height = panel->g_task.maximum_width;
+                       panel->g_task.area.height = panel->g_task.maximum_height;
                }
 
                if (panel->g_task.area.pix.border.rounded > panel->g_task.area.height/2) {
@@ -175,7 +175,6 @@ void task_refresh_tasklist ()
    Task *tsk;
 
    win = server_get_property (server.root_win, server.atom._NET_CLIENT_LIST, XA_WINDOW, &num_results);
-
    if (!win) return;
 
    // Remove any old and set active win
@@ -274,14 +273,14 @@ void resize_taskbar(void *obj)
 
                // new task width for 'desktop'
                task_count = g_slist_length(taskbar->area.list);
-               if (!task_count) pixel_height = panel->g_task.maximum_width;
+               if (!task_count) pixel_height = panel->g_task.maximum_height;
                else {
                        taskbar_height = taskbar->area.height - (2 * panel->g_taskbar.pix.border.width) - (2 * panel->g_taskbar.paddingxlr);
                        if (task_count>1) taskbar_height -= ((task_count-1) * panel->g_taskbar.paddingx);
 
                        pixel_height = taskbar_height / task_count;
-                       if (pixel_height > panel->g_task.maximum_width)
-                               pixel_height = panel->g_task.maximum_width;
+                       if (pixel_height > panel->g_task.maximum_height)
+                               pixel_height = panel->g_task.maximum_height;
                        else
                                modulo_height = taskbar_height % task_count;
                }