Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-02-06 00:01:57 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

libdecor: update from upstream (3f3e5e1d) as of 29-dec-2022

Browse Source
This commit is contained in:
ManoloFLTK
2022-12-29 15:26:28 +01:00
parent 78cf29ba29
commit 83d9a2c63d
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
README.bundled-libs.txt
View File

@@ -15,7 +15,7 @@ bundled image libraries need not be changed.
The nanosvg library is not affected. 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 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 nanosvg abcd277ea4 [1] 2022-12-22 1.4.0
png libpng-1.6.37 2019-04-14 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 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): Previous versions of bundled libraries (FLTK 1.3.x):

2
libdecor/src/plugins/cairo/libdecor-cairo.c
View File

@@ -2712,7 +2712,7 @@ libdecor_plugin_new(struct libdecor *context)
plugin_cairo->font = pango_font_description_new(); plugin_cairo->font = pango_font_description_new();
pango_font_description_set_family(plugin_cairo->font, "sans"); pango_font_description_set_family(plugin_cairo->font, "sans");
pango_font_description_set_weight(plugin_cairo->font, PANGO_WEIGHT_BOLD); 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); wl_display = libdecor_get_wl_display(context);
plugin_cairo->wl_registry = wl_display_get_registry(wl_display); plugin_cairo->wl_registry = wl_display_get_registry(wl_display);

11
libdecor/src/plugins/gtk/libdecor-gtk.c
View File

@@ -1727,17 +1727,18 @@ libdecor_plugin_gtk_frame_get_border_size(struct libdecor_plugin *plugin,
if (bottom) if (bottom)
*bottom = 0; *bottom = 0;
if (top) { 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; GtkWidget *header = ((struct libdecor_frame_gtk *)frame)->header;
enum decoration_type type = window_state_to_decoration_type(window_state); enum decoration_type type = window_state_to_decoration_type(window_state);
/* avoid warnings after decoration has been turned off */ /* 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); *top = gtk_widget_get_allocated_height(header);
else } else {
*top = 0; *top = 0;
}
} }
return true; return true;