diff options
| author | ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> | 2022-12-29 15:26:28 +0100 |
|---|---|---|
| committer | ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> | 2022-12-29 15:26:28 +0100 |
| commit | 83d9a2c63dc168e1e503900ef6c4a1680f16fc54 (patch) | |
| tree | f396a796e9e77bfdd0d4c76b69a5727ff2445a56 | |
| parent | 78cf29ba29aede2f0463e1747dc728787428d543 (diff) | |
libdecor: update from upstream (3f3e5e1d) as of 29-dec-2022
| -rw-r--r-- | README.bundled-libs.txt | 4 | ||||
| -rw-r--r-- | libdecor/src/plugins/cairo/libdecor-cairo.c | 2 | ||||
| -rw-r--r-- | libdecor/src/plugins/gtk/libdecor-gtk.c | 11 |
3 files changed, 9 insertions, 8 deletions
diff --git a/README.bundled-libs.txt b/README.bundled-libs.txt index 653eb6280..40e4b25ee 100644 --- a/README.bundled-libs.txt +++ b/README.bundled-libs.txt @@ -15,7 +15,7 @@ bundled image libraries need not be changed. The nanosvg library is not affected. -Current versions of bundled libraries (as of Dec 23, 2022): +Current versions of bundled libraries (as of Dec 29, 2022): Library Version/git commit Release date FLTK Version -------------------------------------------------------------------------- @@ -23,7 +23,7 @@ Current versions of bundled libraries (as of Dec 23, 2022): nanosvg abcd277ea4 [1] 2022-12-22 1.4.0 png libpng-1.6.37 2019-04-14 1.4.0 zlib zlib-1.2.11 2017-01-15 1.4.0 - libdecor 25f29fef [2] 2022-12-03 1.4.0 + libdecor 3f3e5e1d [2] 2022-12-29 1.4.0 -------------------------------------------------------------------------- Previous versions of bundled libraries (FLTK 1.3.x): diff --git a/libdecor/src/plugins/cairo/libdecor-cairo.c b/libdecor/src/plugins/cairo/libdecor-cairo.c index 0cc0ce0dd..b105917d2 100644 --- a/libdecor/src/plugins/cairo/libdecor-cairo.c +++ b/libdecor/src/plugins/cairo/libdecor-cairo.c @@ -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); diff --git a/libdecor/src/plugins/gtk/libdecor-gtk.c b/libdecor/src/plugins/gtk/libdecor-gtk.c index 661e526d0..228161e43 100644 --- a/libdecor/src/plugins/gtk/libdecor-gtk.c +++ b/libdecor/src/plugins/gtk/libdecor-gtk.c @@ -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; |