Changed indentation everywhere
This commit is contained in:
@@ -34,93 +34,93 @@ int freespace_area_compute_desired_size(void *obj);
|
||||
|
||||
void init_freespace_panel(void *p)
|
||||
{
|
||||
Panel *panel = (Panel *)p;
|
||||
Panel *panel = (Panel *)p;
|
||||
|
||||
// Make sure this is only done once if there are multiple items
|
||||
if (panel->freespace_list)
|
||||
return;
|
||||
// Make sure this is only done once if there are multiple items
|
||||
if (panel->freespace_list)
|
||||
return;
|
||||
|
||||
for (size_t k = 0; k < strlen(panel_items_order); k++) {
|
||||
if (panel_items_order[k] == 'F') {
|
||||
FreeSpace *freespace = (FreeSpace *) calloc(1, sizeof(FreeSpace));
|
||||
panel->freespace_list = g_list_append(panel->freespace_list, freespace);
|
||||
if (!freespace->area.bg)
|
||||
freespace->area.bg = &g_array_index(backgrounds, Background, 0);
|
||||
freespace->area.parent = p;
|
||||
freespace->area.panel = p;
|
||||
snprintf(freespace->area.name, sizeof(freespace->area.name), "Freespace");
|
||||
freespace->area.size_mode = LAYOUT_FIXED;
|
||||
freespace->area.resize_needed = 1;
|
||||
freespace->area.on_screen = TRUE;
|
||||
freespace->area._resize = resize_freespace;
|
||||
freespace->area._compute_desired_size = freespace_area_compute_desired_size;
|
||||
}
|
||||
}
|
||||
for (size_t k = 0; k < strlen(panel_items_order); k++) {
|
||||
if (panel_items_order[k] == 'F') {
|
||||
FreeSpace *freespace = (FreeSpace *)calloc(1, sizeof(FreeSpace));
|
||||
panel->freespace_list = g_list_append(panel->freespace_list, freespace);
|
||||
if (!freespace->area.bg)
|
||||
freespace->area.bg = &g_array_index(backgrounds, Background, 0);
|
||||
freespace->area.parent = p;
|
||||
freespace->area.panel = p;
|
||||
snprintf(freespace->area.name, sizeof(freespace->area.name), "Freespace");
|
||||
freespace->area.size_mode = LAYOUT_FIXED;
|
||||
freespace->area.resize_needed = 1;
|
||||
freespace->area.on_screen = TRUE;
|
||||
freespace->area._resize = resize_freespace;
|
||||
freespace->area._compute_desired_size = freespace_area_compute_desired_size;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void cleanup_freespace(Panel *panel)
|
||||
{
|
||||
if (panel->freespace_list)
|
||||
g_list_free_full(panel->freespace_list, free);
|
||||
panel->freespace_list = NULL;
|
||||
if (panel->freespace_list)
|
||||
g_list_free_full(panel->freespace_list, free);
|
||||
panel->freespace_list = NULL;
|
||||
}
|
||||
|
||||
int freespace_get_max_size(Panel *p)
|
||||
{
|
||||
if (panel_shrink)
|
||||
return 0;
|
||||
// Get space used by every element except the freespace
|
||||
int size = 0;
|
||||
int spacers = 0;
|
||||
for (GList *walk = p->area.children; walk; walk = g_list_next(walk)) {
|
||||
Area *a = (Area *)walk->data;
|
||||
if (panel_shrink)
|
||||
return 0;
|
||||
// Get space used by every element except the freespace
|
||||
int size = 0;
|
||||
int spacers = 0;
|
||||
for (GList *walk = p->area.children; walk; walk = g_list_next(walk)) {
|
||||
Area *a = (Area *)walk->data;
|
||||
|
||||
if (!a->on_screen)
|
||||
continue;
|
||||
if (a->_resize == resize_freespace) {
|
||||
spacers++;
|
||||
continue;
|
||||
}
|
||||
if (!a->on_screen)
|
||||
continue;
|
||||
if (a->_resize == resize_freespace) {
|
||||
spacers++;
|
||||
continue;
|
||||
}
|
||||
|
||||
if (panel_horizontal)
|
||||
size += a->width + p->area.paddingx;
|
||||
else
|
||||
size += a->height + p->area.paddingy;
|
||||
}
|
||||
if (panel_horizontal)
|
||||
size += a->width + p->area.paddingx;
|
||||
else
|
||||
size += a->height + p->area.paddingy;
|
||||
}
|
||||
|
||||
if (panel_horizontal)
|
||||
size = p->area.width - size - left_right_border_width(&p->area) - p->area.paddingxlr;
|
||||
else
|
||||
size = p->area.height - size - top_bottom_border_width(&p->area) - p->area.paddingxlr;
|
||||
if (panel_horizontal)
|
||||
size = p->area.width - size - left_right_border_width(&p->area) - p->area.paddingxlr;
|
||||
else
|
||||
size = p->area.height - size - top_bottom_border_width(&p->area) - p->area.paddingxlr;
|
||||
|
||||
return size / spacers;
|
||||
return size / spacers;
|
||||
}
|
||||
|
||||
int freespace_area_compute_desired_size(void *obj)
|
||||
{
|
||||
FreeSpace *freespace = (FreeSpace *) obj;
|
||||
return freespace_get_max_size((Panel *)freespace->area.panel);
|
||||
FreeSpace *freespace = (FreeSpace *)obj;
|
||||
return freespace_get_max_size((Panel *)freespace->area.panel);
|
||||
}
|
||||
|
||||
gboolean resize_freespace(void *obj)
|
||||
{
|
||||
FreeSpace *freespace = (FreeSpace *)obj;
|
||||
Panel *panel = (Panel *)freespace->area.panel;
|
||||
if (!freespace->area.on_screen)
|
||||
return FALSE;
|
||||
FreeSpace *freespace = (FreeSpace *)obj;
|
||||
Panel *panel = (Panel *)freespace->area.panel;
|
||||
if (!freespace->area.on_screen)
|
||||
return FALSE;
|
||||
|
||||
int old_size = panel_horizontal ? freespace->area.width : freespace->area.height;
|
||||
int size = freespace_get_max_size(panel);
|
||||
if (old_size == size)
|
||||
return FALSE;
|
||||
int old_size = panel_horizontal ? freespace->area.width : freespace->area.height;
|
||||
int size = freespace_get_max_size(panel);
|
||||
if (old_size == size)
|
||||
return FALSE;
|
||||
|
||||
if (panel_horizontal) {
|
||||
freespace->area.width = size;
|
||||
} else {
|
||||
freespace->area.height = size;
|
||||
}
|
||||
if (panel_horizontal) {
|
||||
freespace->area.width = size;
|
||||
} else {
|
||||
freespace->area.height = size;
|
||||
}
|
||||
|
||||
schedule_redraw(&freespace->area);
|
||||
schedule_panel_redraw();
|
||||
return TRUE;
|
||||
schedule_redraw(&freespace->area);
|
||||
schedule_panel_redraw();
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
#include "area.h"
|
||||
|
||||
typedef struct FreeSpace {
|
||||
Area area;
|
||||
Area area;
|
||||
} FreeSpace;
|
||||
|
||||
struct Panel;
|
||||
|
||||
Reference in New Issue
Block a user