all repos — tint2 @ a4c2956eca1b8538a553e4e1234ea4e93efe51de

fork of the tint2 desktop panel for my custom setup - only minimized windows across all desktops for the taskbar

back to ELLIPSIZE_END and multi-line task name. multi-line depend on task vertical_padding and size of font

git-svn-id: http://tint2.googlecode.com/svn/trunk@434 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
thilor77 thilor77@121b4492-b84c-0410-8b4c-0d4edfb3f3cc
commit

a4c2956eca1b8538a553e4e1234ea4e93efe51de

parent

af80193e8909b1a6058807460cbf3f02d9774d84

3 files changed, 11 insertions(+), 9 deletions(-)

jump to
M src/taskbar/task.csrc/taskbar/task.c

@@ -348,39 +348,41 @@ if (panel->g_task.text) {

/* Layout */ layout = pango_cairo_create_layout (c); pango_layout_set_font_description (layout, panel->g_task.font_desc); - pango_layout_set_text (layout, tsk->title, -1); + pango_layout_set_text(layout, tsk->title, -1); /* Drawing width and Cut text */ // pango use U+22EF or U+2026 - pango_layout_set_width (layout, ((Taskbar*)tsk->area.parent)->text_width * PANGO_SCALE); - pango_layout_set_ellipsize (layout, PANGO_ELLIPSIZE_MIDDLE); - //pango_layout_set_wrap(layout, PANGO_WRAP_CHAR); + pango_layout_set_ellipsize (layout, PANGO_ELLIPSIZE_END); + pango_layout_set_width(layout, ((Taskbar*)tsk->area.parent)->text_width * PANGO_SCALE); + pango_layout_set_height(layout, panel->g_task.text_height * PANGO_SCALE); + pango_layout_set_wrap(layout, PANGO_WRAP_CHAR); /* Center text */ if (panel->g_task.centered) pango_layout_set_alignment (layout, PANGO_ALIGN_CENTER); else pango_layout_set_alignment (layout, PANGO_ALIGN_LEFT); pango_layout_get_pixel_size (layout, &width, &height); + //printf("nombre de lignes %d, w %d, h %d, text_height %d\n", pango_layout_get_line_count(layout), width, height, (int)panel->g_task.text_height); config_text = &panel->g_task.font[tsk->current_state]; cairo_set_source_rgba (c, config_text->color[0], config_text->color[1], config_text->color[2], config_text->alpha); pango_cairo_update_layout (c, layout); - cairo_move_to (c, panel->g_task.text_posx, panel->g_task.text_posy); + double text_posy = (panel->g_task.area.height - height) / 2.0; + cairo_move_to (c, panel->g_task.text_posx, text_posy); pango_cairo_show_layout (c, layout); if (panel->g_task.font_shadow) { cairo_set_source_rgba (c, 0.0, 0.0, 0.0, 0.5); pango_cairo_update_layout (c, layout); - cairo_move_to (c, panel->g_task.text_posx + 1, panel->g_task.text_posy + 1); + cairo_move_to (c, panel->g_task.text_posx + 1, text_posy + 1); pango_cairo_show_layout (c, layout); } g_object_unref (layout); } if (panel->g_task.icon) { - // icon use same opacity as text draw_task_icon (tsk, width); } }
M src/taskbar/task.hsrc/taskbar/task.h

@@ -38,7 +38,7 @@ int config_asb_mask;

Background* background[TASK_STATE_COUNT]; int config_background_mask; // starting position for text ~ task_padding + task_border + icon_size - double text_posx, text_posy; + double text_posx, text_height; int font_shadow; PangoFontDescription *font_desc;
M src/taskbar/taskbar.csrc/taskbar/taskbar.c

@@ -142,7 +142,7 @@ if (!panel->g_task.maximum_width && panel_horizontal)

panel->g_task.maximum_width = server.monitor[panel->monitor].width; panel->g_task.text_posx = panel->g_task.background[0]->border.width + panel->g_task.area.paddingxlr; - panel->g_task.text_posy = (panel->g_task.area.height - height) / 2.0; + panel->g_task.text_height = panel->g_task.area.height - (2 * panel->g_task.area.paddingy); if (panel->g_task.icon) { panel->g_task.icon_size1 = panel->g_task.area.height - (2 * panel->g_task.area.paddingy); panel->g_task.text_posx += panel->g_task.icon_size1;