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) {
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);
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
// 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;
}
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