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

Add option to shrink panel (fixes issue #333)

Browse Source
This commit is contained in:
o9000
2016-10-08 14:45:00 +02:00
parent 8c7f4cc825
commit 61a80b996f
17 changed files with 636 additions and 267 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
src/util/area.c
View File

@@ -216,38 +216,34 @@ void relayout_dynamic(Area *a, int level)
}
}
int compute_desired_size(Area *a)
{
if (!a->on_screen)
return 0;
if (a->_compute_desired_size)
return a->_compute_desired_size(a);
if (a->size_mode == LAYOUT_FIXED)
fprintf(stderr, YELLOW "Area %s does not set desired size!" RESET "\n", a->name);
int result = 2 * a->paddingxlr + (panel_horizontal ? left_right_border_width(a) : top_bottom_border_width(a));
int children_count = 0;
for (GList *l = a->children; l != NULL; l = l->next) {
Area *child = (Area *)l->data;
if (child->on_screen) {
result += compute_desired_size(child);
children_count++;
}
}
if (children_count > 0)
result += (children_count - 1) * a->paddingx;
return result;
}
void relayout(Area *a)
{
relayout_fixed(a);
relayout_dynamic(a, 1);
}
void draw_tree(Area *a)
{
if (!a->on_screen)
return;
if (a->_redraw_needed) {
a->_redraw_needed = FALSE;
draw(a);
}
if (a->pix)
XCopyArea(server.display,
a->pix,
((Panel *)a->panel)->temp_pmap,
server.gc,
0,
0,
a->width,
a->height,
a->posx,
a->posy);
for (GList *l = a->children; l; l = l->next)
draw_tree((Area *)l->data);
}
int relayout_with_constraint(Area *a, int maximum_size)
{
int fixed_children_count = 0;
@@ -359,6 +355,32 @@ void schedule_redraw(Area *a)
panel_refresh = TRUE;
}
void draw_tree(Area *a)
{
if (!a->on_screen)
return;
if (a->_redraw_needed) {
a->_redraw_needed = FALSE;
draw(a);
}
if (a->pix)
XCopyArea(server.display,
a->pix,
((Panel *)a->panel)->temp_pmap,
server.gc,
0,
0,
a->width,
a->height,
a->posx,
a->posy);
for (GList *l = a->children; l; l = l->next)
draw_tree((Area *)l->data);
}
void hide(Area *a)
{
Area *parent = (Area *)a->parent;
@@ -818,13 +840,14 @@ void area_dump_geometry(Area *area, int indent)
return;
}
fprintf(stderr,
"%*sBox: x = %d, y = %d, w = %d, h = %d\n",
"%*sBox: x = %d, y = %d, w = %d, h = %d, desired size = %d\n",
indent,
"",
area->posx,
area->posy,
area->width,
area->height);
area->height,
compute_desired_size(area));
fprintf(stderr,
"%*sBorder: left = %d, right = %d, top = %d, bottom = %d\n",
indent,