nilix/tint2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

#716 fix executor spacing

Browse source
This commit is contained in:
Chris Lee 2018-09-15 05:46:14 +00:00
parent a82b9a1d7f
commit 970c597796
2 changed files with 32 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -1,3 +1,6 @@
2018-09-14 master
- Fix spacing around icons in executor without text in vertical panels (issue #716)
2018-08-05 16.6.1 2018-08-05 16.6.1
- Fix packaging regression for debian (issue #715) - Fix packaging regression for debian (issue #715)

39
src/execplugin/execplugin.c
View file

@ -373,7 +373,11 @@ void execp_compute_icon_text_geometry(Execp *execp,
*new_size = *txt_height + 2 * *vert_padding + top_bottom_border_width(area); *new_size = *txt_height + 2 * *vert_padding + top_bottom_border_width(area);
*new_size = MAX(*new_size, *icon_h + 2 * *vert_padding + top_bottom_border_width(area)); *new_size = MAX(*new_size, *icon_h + 2 * *vert_padding + top_bottom_border_width(area));
} else { } else {
*new_size = *icon_h + *interior_padding + *txt_height + 2 * *vert_padding + top_bottom_border_width(area); if (strlen(execp->backend->text)) {
*new_size = *icon_h + *interior_padding + *txt_height + 2 * *vert_padding + top_bottom_border_width(area);
} else {
*new_size = *icon_h + 2 * *vert_padding + top_bottom_border_width(area);
}
} }
if (*new_size != area->height) { if (*new_size != area->height) {
*resized = TRUE; *resized = TRUE;
@ -441,10 +445,17 @@ gboolean resize_execp(void *obj)
execp->frontend->texty = (execp->area.height - txt_height) / 2; execp->frontend->texty = (execp->area.height - txt_height) / 2;
execp->frontend->textx = execp->frontend->iconx + icon_w + interior_padding; execp->frontend->textx = execp->frontend->iconx + icon_w + interior_padding;
} else { } else {
execp->frontend->icony = (execp->area.height - icon_h - interior_padding - txt_height) / 2; if (strlen(execp->backend->text)) {
execp->frontend->iconx = (execp->area.width - icon_w) / 2; execp->frontend->icony = (execp->area.height - icon_h - interior_padding - txt_height) / 2;
execp->frontend->texty = execp->frontend->icony + icon_h + interior_padding; execp->frontend->iconx = (execp->area.width - icon_w) / 2;
execp->frontend->textx = (execp->area.width - txt_width) / 2; execp->frontend->texty = execp->frontend->icony + icon_h + interior_padding;
execp->frontend->textx = (execp->area.width - txt_width) / 2;
} else {
execp->frontend->icony = (execp->area.height - icon_h) / 2;
execp->frontend->iconx = (execp->area.width - icon_w) / 2;
execp->frontend->texty = execp->frontend->icony + icon_h + interior_padding;
execp->frontend->textx = (execp->area.width - txt_width) / 2;
}
} }
} else { } else {
execp->frontend->texty = (execp->area.height - txt_height) / 2; execp->frontend->texty = (execp->area.height - txt_height) / 2;
@ -458,10 +469,17 @@ gboolean resize_execp(void *obj)
execp->frontend->texty = (execp->area.height - txt_height) / 2; execp->frontend->texty = (execp->area.height - txt_height) / 2;
execp->frontend->textx = execp->frontend->iconx + icon_w + interior_padding; execp->frontend->textx = execp->frontend->iconx + icon_w + interior_padding;
} else { } else {
execp->frontend->icony = (execp->area.height - icon_h - interior_padding - txt_height) / 2; if (strlen(execp->backend->text)) {
execp->frontend->iconx = left_border_width(&execp->area) + horiz_padding; execp->frontend->icony = (execp->area.height - icon_h - interior_padding - txt_height) / 2;
execp->frontend->texty = execp->frontend->icony + icon_h + interior_padding; execp->frontend->iconx = left_border_width(&execp->area) + horiz_padding;
execp->frontend->textx = execp->frontend->iconx; execp->frontend->texty = execp->frontend->icony + icon_h + interior_padding;
execp->frontend->textx = execp->frontend->iconx;
} else {
execp->frontend->icony = (execp->area.height - icon_h) / 2;
execp->frontend->iconx = left_border_width(&execp->area) + horiz_padding;
execp->frontend->texty = execp->frontend->icony + icon_h + interior_padding;
execp->frontend->textx = execp->frontend->iconx;
}
} }
} else { } else {
execp->frontend->texty = (execp->area.height - txt_height) / 2; execp->frontend->texty = (execp->area.height - txt_height) / 2;
@ -531,12 +549,13 @@ void execp_dump_geometry(void *obj, int indent)
imlib_context_set_image(tmp); imlib_context_set_image(tmp);
} }
fprintf(stderr, fprintf(stderr,
"tint2: %*sText: x = %d, y = %d, w = %d, align = %s, text = %s\n", "tint2: %*sText: x = %d, y = %d, w = %d, h = %d, align = %s, text = %s\n",
indent, indent,
"", "",
execp->frontend->textx, execp->frontend->textx,
execp->frontend->texty, execp->frontend->texty,
execp->frontend->textw, execp->frontend->textw,
execp->frontend->texth,
execp->backend->centered ? "center" : "left", execp->backend->centered ? "center" : "left",
execp->backend->text); execp->backend->text);
} }