summaryrefslogtreecommitdiff
path: root/libdecor/src/plugins/gtk
diff options
context:
space:
mode:
authorManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com>2023-05-02 11:35:28 +0200
committerManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com>2023-05-02 11:35:28 +0200
commitcad6e632961c352f108233af039940387feffb9a (patch)
tree33d0fef574362efdd653155a4c8defdac1b7734a /libdecor/src/plugins/gtk
parent0394a27074b8067bf22b586ab52f22d79f088f10 (diff)
libdecor: update with upstream source code as of 2023-may-2
This will allow to create narrow decorated windows without crash.
Diffstat (limited to 'libdecor/src/plugins/gtk')
-rw-r--r--libdecor/src/plugins/gtk/libdecor-gtk.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/libdecor/src/plugins/gtk/libdecor-gtk.c b/libdecor/src/plugins/gtk/libdecor-gtk.c
index 228161e43..b0b1b2f36 100644
--- a/libdecor/src/plugins/gtk/libdecor-gtk.c
+++ b/libdecor/src/plugins/gtk/libdecor-gtk.c
@@ -1350,7 +1350,7 @@ draw_title_bar(struct libdecor_frame_gtk *frame_gtk)
enum libdecor_window_state state;
GtkStyleContext *style;
int pref_width;
- int current_min_w, current_min_h, W, H;
+ int current_min_w, current_min_h, current_max_w, current_max_h, W, H;
state = libdecor_frame_get_window_state((struct libdecor_frame*)frame_gtk);
style = gtk_widget_get_style_context(frame_gtk->window);
@@ -1378,10 +1378,10 @@ draw_title_bar(struct libdecor_frame_gtk *frame_gtk)
if (current_min_w < pref_width) {
current_min_w = pref_width;
libdecor_frame_set_min_content_size(&frame_gtk->frame, current_min_w, current_min_h);
- if (!resizable(frame_gtk)) {
- libdecor_frame_set_max_content_size(&frame_gtk->frame,
- current_min_w, current_min_h);
- }
+ }
+ libdecor_frame_get_max_content_size(&frame_gtk->frame, &current_max_w, &current_max_h);
+ if (current_max_w && current_max_w < current_min_w) {
+ libdecor_frame_set_max_content_size(&frame_gtk->frame, current_min_w, current_max_h);
}
W = libdecor_frame_get_content_width(&frame_gtk->frame);
H = libdecor_frame_get_content_height(&frame_gtk->frame);