mirror of
https://github.com/fltk/fltk.git
synced 2026-02-05 15:59:50 +08:00
libdecor: update from upstream (3f3e5e1d) as of 29-dec-2022
This commit is contained in:
@@ -2712,7 +2712,7 @@ libdecor_plugin_new(struct libdecor *context)
|
||||
plugin_cairo->font = pango_font_description_new();
|
||||
pango_font_description_set_family(plugin_cairo->font, "sans");
|
||||
pango_font_description_set_weight(plugin_cairo->font, PANGO_WEIGHT_BOLD);
|
||||
pango_font_description_set_size(plugin_cairo->font, SYM_DIM * PANGO_SCALE);
|
||||
pango_font_description_set_absolute_size(plugin_cairo->font, SYM_DIM * PANGO_SCALE);
|
||||
|
||||
wl_display = libdecor_get_wl_display(context);
|
||||
plugin_cairo->wl_registry = wl_display_get_registry(wl_display);
|
||||
|
||||
@@ -1727,17 +1727,18 @@ libdecor_plugin_gtk_frame_get_border_size(struct libdecor_plugin *plugin,
|
||||
if (bottom)
|
||||
*bottom = 0;
|
||||
if (top) {
|
||||
/* Redraw decoration to ensure size will be up-to-date */
|
||||
draw_decoration((struct libdecor_frame_gtk *) frame);
|
||||
|
||||
GtkWidget *header = ((struct libdecor_frame_gtk *)frame)->header;
|
||||
enum decoration_type type = window_state_to_decoration_type(window_state);
|
||||
|
||||
/* avoid warnings after decoration has been turned off */
|
||||
if (GTK_IS_WIDGET(header) && (type != DECORATION_TYPE_NONE))
|
||||
if (GTK_IS_WIDGET(header) && (type != DECORATION_TYPE_NONE)) {
|
||||
/* Redraw title bar to ensure size will be up-to-date */
|
||||
if (configuration && type == DECORATION_TYPE_TITLE_ONLY)
|
||||
draw_title_bar((struct libdecor_frame_gtk *) frame);
|
||||
*top = gtk_widget_get_allocated_height(header);
|
||||
else
|
||||
} else {
|
||||
*top = 0;
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
|
||||
Reference in New Issue
Block a user