X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Ftaskbar%2Ftaskbar.c;h=5619aa8eee044cd3d5899de8865fb2e133f55d85;hb=ec513ecaad1f9bdc553b2045b730c50af7eb087a;hp=deb6e04fa07a5b4be8d57ece25cfecddf44f9e32;hpb=abf45e5ca6bb9c715f1455ab898c3a51e26dbf57;p=chaz%2Ftint2

diff --git a/src/taskbar/taskbar.c b/src/taskbar/taskbar.c
index deb6e04..5619aa8 100644
--- 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) {
@@ -84,11 +84,10 @@ void init_taskbar()
 		int height_ink, height;
 		get_text_size(panel->g_task.font_desc, &height_ink, &height, panel->area.height, "TAjpg", 5);
 
-		if (!panel->g_task.maximum_width)
+		if (!panel->g_task.maximum_width && panel_horizontal)
 			panel->g_task.maximum_width = server.monitor[panel->monitor].width;
 
-		// add task_icon_size
-		panel->g_task.text_posx = panel->g_task.area.paddingxlr + panel->g_task.area.pix.border.width;
+		panel->g_task.text_posx = panel->g_task.area.pix.border.width + panel->g_task.area.paddingxlr;
 		panel->g_task.text_posy = (panel->g_task.area.height - height) / 2.0;
 		if (panel->g_task.icon) {
 			panel->g_task.icon_size1 = panel->g_task.area.height - (2 * panel->g_task.area.paddingy);
@@ -176,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
@@ -275,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;
 		}
@@ -292,7 +290,7 @@ void resize_taskbar(void *obj)
 		else {
 			taskbar->task_width = pixel_height;
 			taskbar->task_modulo = modulo_height;
-			taskbar->text_width = taskbar->area.width - (2 * taskbar->area.paddingy) - (2 * taskbar->area.pix.border.width);
+			taskbar->text_width = taskbar->area.width - (2 * panel->g_taskbar.paddingy) - panel->g_task.text_posx - panel->g_task.area.pix.border.width - panel->g_task.area.paddingx;
 		}
 
 		// change pos_y and height for all tasks