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

Gradients: release memory

Browse Source
This commit is contained in:
o9000
2016-10-04 17:57:03 +02:00
parent 1922cafa14
commit a5434a362b
12 changed files with 54 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/taskbar/task.c
View File

@@ -595,9 +595,9 @@ void set_task_state(Task *task, TaskState state)
Task *task1 = g_ptr_array_index(task_buttons, i);
task1->current_state = state;
task1->area.bg = panels[0].g_task.background[state];
free_area_gradients(&task1->area);
task1->area.gradients = panels[0].g_task.gradient[state];
init_area_gradients(&task1->area);
free_area_gradient_instances(&task1->area);
task1->area.gradients = g_list_copy(panels[0].g_task.gradient[state]);
instantiate_area_gradients(&task1->area);
schedule_redraw(&task1->area);
if (state == TASK_ACTIVE && g_slist_find(urgent_list, task1))
del_urgent(task1);

33
src/taskbar/taskbar.c
View File

@@ -116,6 +116,15 @@ void cleanup_taskbar()
urgent_list = NULL;
stop_timeout(urgent_timeout);
for (int state = 0; state < TASK_STATE_COUNT; state++) {
g_list_free(panel_config.g_task.gradient[state]);
}
for (int state = 0; state < TASKBAR_STATE_COUNT; state++) {
g_list_free(panel_config.g_taskbar.gradient[state]);
g_list_free(panel_config.g_taskbar.gradient_name[state]);
}
}
void init_taskbar()
@@ -306,14 +315,14 @@ void init_taskbar_panel(void *p)
taskbar->desktop = j;
if (j == server.desktop) {
taskbar->area.bg = panel->g_taskbar.background[TASKBAR_ACTIVE];
free_area_gradients(&taskbar->area);
taskbar->area.gradients = panel->g_taskbar.gradient[TASKBAR_ACTIVE];
init_area_gradients(&taskbar->area);
free_area_gradient_instances(&taskbar->area);
taskbar->area.gradients = g_list_copy(panel->g_taskbar.gradient[TASKBAR_ACTIVE]);
instantiate_area_gradients(&taskbar->area);
} else {
taskbar->area.bg = panel->g_taskbar.background[TASKBAR_NORMAL];
free_area_gradients(&taskbar->area);
taskbar->area.gradients = panel->g_taskbar.gradient[TASKBAR_NORMAL];
init_area_gradients(&taskbar->area);
free_area_gradient_instances(&taskbar->area);
taskbar->area.gradients = g_list_copy(panel->g_taskbar.gradient[TASKBAR_NORMAL]);
instantiate_area_gradients(&taskbar->area);
}
}
@@ -486,15 +495,15 @@ void update_all_taskbars_visibility()
void set_taskbar_state(Taskbar *taskbar, TaskbarState state)
{
taskbar->area.bg = panels[0].g_taskbar.background[state];
free_area_gradients(&taskbar->area);
taskbar->area.gradients = panels[0].g_taskbar.gradient[state];
init_area_gradients(&taskbar->area);
free_area_gradient_instances(&taskbar->area);
taskbar->area.gradients = g_list_copy(panels[0].g_taskbar.gradient[state]);
instantiate_area_gradients(&taskbar->area);
if (taskbarname_enabled) {
taskbar->bar_name.area.bg = panels[0].g_taskbar.background_name[state];
free_area_gradients(&taskbar->bar_name.area);
taskbar->bar_name.area.gradients = panels[0].g_taskbar.gradient_name[state];
init_area_gradients(&taskbar->bar_name.area);
free_area_gradient_instances(&taskbar->bar_name.area);
taskbar->bar_name.area.gradients = g_list_copy(panels[0].g_taskbar.gradient_name[state]);
instantiate_area_gradients(&taskbar->bar_name.area);
}
update_taskbar_visibility(taskbar);

6
src/taskbar/taskbarname.c
View File

@@ -62,10 +62,10 @@ void init_taskbarname_panel(void *p)
taskbar->bar_name.area.has_mouse_press_effect = panel_config.mouse_effects;
if (j == server.desktop) {
taskbar->bar_name.area.bg = panel->g_taskbar.background_name[TASKBAR_ACTIVE];
taskbar->bar_name.area.gradients = panel->g_taskbar.gradient_name[TASKBAR_ACTIVE];
taskbar->bar_name.area.gradients = g_list_copy(panel->g_taskbar.gradient_name[TASKBAR_ACTIVE]);
} else {
taskbar->bar_name.area.bg = panel->g_taskbar.background_name[TASKBAR_NORMAL];
taskbar->bar_name.area.gradients = panel->g_taskbar.gradient_name[TASKBAR_NORMAL];
taskbar->bar_name.area.gradients = g_list_copy(panel->g_taskbar.gradient_name[TASKBAR_NORMAL]);
}
// use desktop number if name is missing
@@ -78,7 +78,7 @@ void init_taskbarname_panel(void *p)
// append the name at the beginning of taskbar
taskbar->area.children = g_list_append(taskbar->area.children, &taskbar->bar_name);
init_area_gradients(&taskbar->bar_name.area);
instantiate_area_gradients(&taskbar->bar_name.area);
}
for (l = list; l; l = l->next)