Mabox/tint2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: http://tint2.googlecode.com/svn/trunk@434 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
This commit is contained in:
thilor77
2010-04-19 21:44:40 +00:00
parent af80193e89
commit a4c2956eca
3 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/taskbar/task.c
View File

@@ -348,39 +348,41 @@ void draw_task (void *obj, cairo_t *c)
/* Layout */ /* Layout */
layout = pango_cairo_create_layout (c); layout = pango_cairo_create_layout (c);
pango_layout_set_font_description (layout, panel->g_task.font_desc); 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 */ /* Drawing width and Cut text */
// pango use U+22EF or U+2026 // 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_END);
pango_layout_set_ellipsize (layout, PANGO_ELLIPSIZE_MIDDLE); pango_layout_set_width(layout, ((Taskbar*)tsk->area.parent)->text_width * PANGO_SCALE);
//pango_layout_set_wrap(layout, PANGO_WRAP_CHAR); pango_layout_set_height(layout, panel->g_task.text_height * PANGO_SCALE);
pango_layout_set_wrap(layout, PANGO_WRAP_CHAR);
/* Center text */ /* Center text */
if (panel->g_task.centered) pango_layout_set_alignment (layout, PANGO_ALIGN_CENTER); if (panel->g_task.centered) pango_layout_set_alignment (layout, PANGO_ALIGN_CENTER);
else pango_layout_set_alignment (layout, PANGO_ALIGN_LEFT); else pango_layout_set_alignment (layout, PANGO_ALIGN_LEFT);
pango_layout_get_pixel_size (layout, &width, &height); 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]; 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); 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); 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); pango_cairo_show_layout (c, layout);
if (panel->g_task.font_shadow) { if (panel->g_task.font_shadow) {
cairo_set_source_rgba (c, 0.0, 0.0, 0.0, 0.5); cairo_set_source_rgba (c, 0.0, 0.0, 0.0, 0.5);
pango_cairo_update_layout (c, layout); 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); pango_cairo_show_layout (c, layout);
} }
g_object_unref (layout); g_object_unref (layout);
} }
if (panel->g_task.icon) { if (panel->g_task.icon) {
// icon use same opacity as text
draw_task_icon (tsk, width); draw_task_icon (tsk, width);
} }
} }

2
src/taskbar/task.h
View File

@@ -38,7 +38,7 @@ typedef struct {
Background* background[TASK_STATE_COUNT]; Background* background[TASK_STATE_COUNT];
int config_background_mask; int config_background_mask;
// starting position for text ~ task_padding + task_border + icon_size // starting position for text ~ task_padding + task_border + icon_size
double text_posx, text_posy; double text_posx, text_height;
int font_shadow; int font_shadow;
PangoFontDescription *font_desc; PangoFontDescription *font_desc;

2
src/taskbar/taskbar.c
View File

@@ -142,7 +142,7 @@ void init_taskbar()
panel->g_task.maximum_width = server.monitor[panel->monitor].width; 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_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) { if (panel->g_task.icon) {
panel->g_task.icon_size1 = panel->g_task.area.height - (2 * panel->g_task.area.paddingy); 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; panel->g_task.text_posx += panel->g_task.icon_size1;