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

Fix lost font setting for desktop name

Browse Source
This commit is contained in:
o9000
2015-09-12 03:08:25 +02:00
parent 1f7f1971ec
commit 5b01670a22
5 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/config.c
View File

@@ -581,7 +581,7 @@ void add_entry (char *key, char *value)
panel_config.g_taskbar.background_name[TASKBAR_ACTIVE] = &g_array_index(backgrounds, Background, id); panel_config.g_taskbar.background_name[TASKBAR_ACTIVE] = &g_array_index(backgrounds, Background, id);
} }
else if (strcmp (key, "taskbar_name_font") == 0) { else if (strcmp (key, "taskbar_name_font") == 0) {
taskbarname_font_desc = pango_font_description_from_string (value); panel_config.taskbarname_font_desc = pango_font_description_from_string(value);
} }
else if (strcmp (key, "taskbar_name_font_color") == 0) { else if (strcmp (key, "taskbar_name_font_color") == 0) {
extract_values(value, &value1, &value2, &value3); extract_values(value, &value1, &value2, &value3);

2
src/panel.c
View File

@@ -140,6 +140,8 @@ void cleanup_panel()
backgrounds = NULL; backgrounds = NULL;
pango_font_description_free(panel_config.g_task.font_desc); pango_font_description_free(panel_config.g_task.font_desc);
panel_config.g_task.font_desc = NULL; panel_config.g_task.font_desc = NULL;
pango_font_description_free(panel_config.taskbarname_font_desc);
panel_config.taskbarname_font_desc = NULL;
} }
void init_panel() void init_panel()

1
src/panel.h
View File

@@ -104,6 +104,7 @@ typedef struct {
// while panel->area.list is used to loop over all panel's objects // while panel->area.list is used to loop over all panel's objects
Taskbar *taskbar; Taskbar *taskbar;
int nb_desktop; int nb_desktop;
PangoFontDescription *taskbarname_font_desc;
// -------------------------------------------------- // --------------------------------------------------
// clock // clock

11
src/taskbar/taskbarname.c
View File

@@ -54,8 +54,8 @@ void init_taskbarname_panel(void *p)
if (!taskbarname_enabled) if (!taskbarname_enabled)
return; return;
if (!taskbarname_font_desc) if (!panel_config.taskbarname_font_desc)
taskbarname_font_desc = pango_font_description_from_string(DEFAULT_FONT); panel_config.taskbarname_font_desc = pango_font_description_from_string(DEFAULT_FONT);
GSList *l, *list = server_get_name_of_desktop(); GSList *l, *list = server_get_name_of_desktop();
for (j=0, l=list ; j < panel->nb_desktop ; j++) { for (j=0, l=list ; j < panel->nb_desktop ; j++) {
@@ -106,9 +106,6 @@ void cleanup_taskbarname()
tskbar->area.list = g_list_remove(tskbar->area.list, &tskbar->bar_name); tskbar->area.list = g_list_remove(tskbar->area.list, &tskbar->bar_name);
} }
} }
pango_font_description_free(taskbarname_font_desc);
taskbarname_font_desc = NULL;
} }
@@ -124,7 +121,7 @@ void draw_taskbarname (void *obj, cairo_t *c)
// draw content // draw content
layout = pango_cairo_create_layout (c); layout = pango_cairo_create_layout (c);
pango_layout_set_font_description (layout, taskbarname_font_desc); pango_layout_set_font_description (layout, panel_config.taskbarname_font_desc);
pango_layout_set_width (layout, taskbar_name->area.width * PANGO_SCALE); pango_layout_set_width (layout, taskbar_name->area.width * PANGO_SCALE);
pango_layout_set_alignment (layout, PANGO_ALIGN_CENTER); pango_layout_set_alignment (layout, PANGO_ALIGN_CENTER);
pango_layout_set_text (layout, taskbar_name->name, strlen(taskbar_name->name)); pango_layout_set_text (layout, taskbar_name->name, strlen(taskbar_name->name));
@@ -147,7 +144,7 @@ int resize_taskbarname(void *obj)
int ret = 0; int ret = 0;
taskbar_name->area.redraw = 1; taskbar_name->area.redraw = 1;
get_text_size2(taskbarname_font_desc, &name_height_ink, &name_height, &name_width, panel->area.height, panel->area.width, taskbar_name->name, strlen(taskbar_name->name)); get_text_size2(panel_config.taskbarname_font_desc, &name_height_ink, &name_height, &name_width, panel->area.height, panel->area.width, taskbar_name->name, strlen(taskbar_name->name));
if (panel_horizontal) { if (panel_horizontal) {
int new_size = name_width + (2* (taskbar_name->area.paddingxlr + taskbar_name->area.bg->border.width)); int new_size = name_width + (2* (taskbar_name->area.paddingxlr + taskbar_name->area.bg->border.width));

1
src/taskbar/taskbarname.h
View File

@@ -9,7 +9,6 @@
#include "area.h" #include "area.h"
extern int taskbarname_enabled; extern int taskbarname_enabled;
extern PangoFontDescription *taskbarname_font_desc;
extern Color taskbarname_font; extern Color taskbarname_font;
extern Color taskbarname_active_font; extern Color taskbarname_active_font;