|
|
92c277c |
From 41be4271e18a21acbcc30d1e61653190f8ef7a6d Mon Sep 17 00:00:00 2001
|
|
|
92c277c |
From: Paul Cornett <paulcor@users.noreply.github.com>
|
|
|
92c277c |
Date: Fri, 5 Feb 2016 10:26:06 -0800
|
|
|
92c277c |
Subject: [PATCH] Adapt window decorations cache for client-side decorations
|
|
|
92c277c |
|
|
|
92c277c |
Fixes size calculations for TLWs created after the first one,
|
|
|
92c277c |
with Wayland, Mir and Broadway. See #17336
|
|
|
92c277c |
|
|
|
92c277c |
(cherry picked from commit 91ea4872813b90ff91702a11abbe644cb1e5044b)
|
|
|
92c277c |
---
|
|
|
92c277c |
src/gtk/toplevel.cpp | 93 +++++++++++++++++++++++++++++++++++++++++++++++-----
|
|
|
92c277c |
1 file changed, 84 insertions(+), 9 deletions(-)
|
|
|
92c277c |
|
|
|
92c277c |
diff --git a/src/gtk/toplevel.cpp b/src/gtk/toplevel.cpp
|
|
|
92c277c |
index 7530b0f..c3d42e8 100644
|
|
|
92c277c |
--- a/src/gtk/toplevel.cpp
|
|
|
92c277c |
+++ b/src/gtk/toplevel.cpp
|
|
|
92c277c |
@@ -40,6 +40,15 @@
|
|
|
92c277c |
#endif
|
|
|
92c277c |
#ifdef GDK_WINDOWING_WAYLAND
|
|
|
92c277c |
#include <gdk/gdkwayland.h>
|
|
|
92c277c |
+ #define HAS_CLIENT_DECOR
|
|
|
92c277c |
+#endif
|
|
|
92c277c |
+#ifdef GDK_WINDOWING_MIR
|
|
|
92c277c |
+ #include <gdk/gdkmir.h>
|
|
|
92c277c |
+ #define HAS_CLIENT_DECOR
|
|
|
92c277c |
+#endif
|
|
|
92c277c |
+#ifdef GDK_WINDOWING_BROADWAY
|
|
|
92c277c |
+ #include <gdk/gdkbroadway.h>
|
|
|
92c277c |
+ #define HAS_CLIENT_DECOR
|
|
|
92c277c |
#endif
|
|
|
92c277c |
|
|
|
92c277c |
#include "wx/gtk/private.h"
|
|
|
92c277c |
@@ -82,6 +91,26 @@ static enum {
|
|
|
92c277c |
static bool gs_decorCacheValid;
|
|
|
92c277c |
#endif
|
|
|
92c277c |
|
|
|
92c277c |
+#ifdef HAS_CLIENT_DECOR
|
|
|
92c277c |
+static bool HasClientDecor(GtkWidget* widget)
|
|
|
92c277c |
+{
|
|
|
92c277c |
+ GdkDisplay* display = gtk_widget_get_display(widget);
|
|
|
92c277c |
+#ifdef GDK_WINDOWING_WAYLAND
|
|
|
92c277c |
+ if (GDK_IS_WAYLAND_DISPLAY(display))
|
|
|
92c277c |
+ return true;
|
|
|
92c277c |
+#endif
|
|
|
92c277c |
+#ifdef GDK_WINDOWING_MIR
|
|
|
92c277c |
+ if (GDK_IS_MIR_DISPLAY(display))
|
|
|
92c277c |
+ return true;
|
|
|
92c277c |
+#endif
|
|
|
92c277c |
+#ifdef GDK_WINDOWING_BROADWAY
|
|
|
92c277c |
+ if (GDK_IS_BROADWAY_DISPLAY(display))
|
|
|
92c277c |
+ return true;
|
|
|
92c277c |
+#endif
|
|
|
92c277c |
+ return false;
|
|
|
92c277c |
+}
|
|
|
92c277c |
+#endif // HAS_CLIENT_DECOR
|
|
|
92c277c |
+
|
|
|
92c277c |
//-----------------------------------------------------------------------------
|
|
|
92c277c |
// RequestUserAttention related functions
|
|
|
92c277c |
//-----------------------------------------------------------------------------
|
|
|
92c277c |
@@ -235,8 +264,24 @@ size_allocate(GtkWidget*, GtkAllocation* alloc, wxTopLevelWindowGTK* win)
|
|
|
92c277c |
GtkAllocation a;
|
|
|
92c277c |
gtk_widget_get_allocation(win->m_widget, &a);
|
|
|
92c277c |
wxSize size(a.width, a.height);
|
|
|
92c277c |
- size.x += win->m_decorSize.left + win->m_decorSize.right;
|
|
|
92c277c |
- size.y += win->m_decorSize.top + win->m_decorSize.bottom;
|
|
|
92c277c |
+#ifdef HAS_CLIENT_DECOR
|
|
|
92c277c |
+ if (HasClientDecor(win->m_widget))
|
|
|
92c277c |
+ {
|
|
|
92c277c |
+ GtkAllocation a2;
|
|
|
92c277c |
+ gtk_widget_get_allocation(win->m_mainWidget, &a2;;
|
|
|
92c277c |
+ wxTopLevelWindowGTK::DecorSize decorSize;
|
|
|
92c277c |
+ decorSize.left = a2.x;
|
|
|
92c277c |
+ decorSize.right = a.width - a2.width - a2.x;
|
|
|
92c277c |
+ decorSize.top = a2.y;
|
|
|
92c277c |
+ decorSize.bottom = a.height - a2.height - a2.y;
|
|
|
92c277c |
+ win->GTKUpdateDecorSize(decorSize);
|
|
|
92c277c |
+ }
|
|
|
92c277c |
+ else
|
|
|
92c277c |
+#endif
|
|
|
92c277c |
+ {
|
|
|
92c277c |
+ size.x += win->m_decorSize.left + win->m_decorSize.right;
|
|
|
92c277c |
+ size.y += win->m_decorSize.top + win->m_decorSize.bottom;
|
|
|
92c277c |
+ }
|
|
|
92c277c |
win->m_width = size.x;
|
|
|
92c277c |
win->m_height = size.y;
|
|
|
92c277c |
|
|
|
92c277c |
@@ -1062,8 +1107,13 @@ void wxTopLevelWindowGTK::DoMoveWindow(int WXUNUSED(x), int WXUNUSED(y), int WXU
|
|
|
92c277c |
void wxTopLevelWindowGTK::GTKDoGetSize(int *width, int *height) const
|
|
|
92c277c |
{
|
|
|
92c277c |
wxSize size(m_width, m_height);
|
|
|
92c277c |
- size.x -= m_decorSize.left + m_decorSize.right;
|
|
|
92c277c |
- size.y -= m_decorSize.top + m_decorSize.bottom;
|
|
|
92c277c |
+#ifdef HAS_CLIENT_DECOR
|
|
|
92c277c |
+ if (!HasClientDecor(m_widget))
|
|
|
92c277c |
+#endif
|
|
|
92c277c |
+ {
|
|
|
92c277c |
+ size.x -= m_decorSize.left + m_decorSize.right;
|
|
|
92c277c |
+ size.y -= m_decorSize.top + m_decorSize.bottom;
|
|
|
92c277c |
+ }
|
|
|
92c277c |
if (size.x < 0) size.x = 0;
|
|
|
92c277c |
if (size.y < 0) size.y = 0;
|
|
|
92c277c |
#if wxUSE_LIBHILDON2
|
|
|
92c277c |
@@ -1171,7 +1221,12 @@ void wxTopLevelWindowGTK::DoGetClientSize( int *width, int *height ) const
|
|
|
92c277c |
base_type::DoGetClientSize(width, height);
|
|
|
92c277c |
else
|
|
|
92c277c |
{
|
|
|
92c277c |
- GTKDoGetSize(width, height);
|
|
|
92c277c |
+ int w = m_width - (m_decorSize.left + m_decorSize.right);
|
|
|
92c277c |
+ int h = m_height - (m_decorSize.top + m_decorSize.bottom);
|
|
|
92c277c |
+ if (w < 0) w = 0;
|
|
|
92c277c |
+ if (h < 0) h = 0;
|
|
|
92c277c |
+ if (width) *width = w;
|
|
|
92c277c |
+ if (height) *height = h;
|
|
|
92c277c |
}
|
|
|
92c277c |
}
|
|
|
92c277c |
|
|
|
92c277c |
@@ -1193,8 +1248,20 @@ void wxTopLevelWindowGTK::DoSetSizeHints( int minW, int minH,
|
|
|
92c277c |
hints.min_height = 1;
|
|
|
92c277c |
hints.max_width = INT_MAX;
|
|
|
92c277c |
hints.max_height = INT_MAX;
|
|
|
92c277c |
- const int decorSize_x = m_decorSize.left + m_decorSize.right;
|
|
|
92c277c |
- const int decorSize_y = m_decorSize.top + m_decorSize.bottom;
|
|
|
92c277c |
+ int decorSize_x;
|
|
|
92c277c |
+ int decorSize_y;
|
|
|
92c277c |
+#ifdef HAS_CLIENT_DECOR
|
|
|
92c277c |
+ if (HasClientDecor(m_widget))
|
|
|
92c277c |
+ {
|
|
|
92c277c |
+ decorSize_x = 0;
|
|
|
92c277c |
+ decorSize_y = 0;
|
|
|
92c277c |
+ }
|
|
|
92c277c |
+ else
|
|
|
92c277c |
+#endif
|
|
|
92c277c |
+ {
|
|
|
92c277c |
+ decorSize_x = m_decorSize.left + m_decorSize.right;
|
|
|
92c277c |
+ decorSize_y = m_decorSize.top + m_decorSize.bottom;
|
|
|
92c277c |
+ }
|
|
|
92c277c |
if (minSize.x > decorSize_x)
|
|
|
92c277c |
hints.min_width = minSize.x - decorSize_x;
|
|
|
92c277c |
if (minSize.y > decorSize_y)
|
|
|
92c277c |
@@ -1221,11 +1288,19 @@ void wxTopLevelWindowGTK::DoSetSizeHints( int minW, int minH,
|
|
|
92c277c |
(GtkWindow*)m_widget, NULL, &hints, (GdkWindowHints)hints_mask);
|
|
|
92c277c |
}
|
|
|
92c277c |
|
|
|
92c277c |
-#ifdef GDK_WINDOWING_X11
|
|
|
92c277c |
void wxTopLevelWindowGTK::GTKUpdateDecorSize(const DecorSize& decorSize)
|
|
|
92c277c |
{
|
|
|
92c277c |
if (!IsMaximized() && !IsFullScreen())
|
|
|
92c277c |
GetCachedDecorSize() = decorSize;
|
|
|
92c277c |
+
|
|
|
92c277c |
+#ifdef HAS_CLIENT_DECOR
|
|
|
92c277c |
+ if (HasClientDecor(m_widget))
|
|
|
92c277c |
+ {
|
|
|
92c277c |
+ m_decorSize = decorSize;
|
|
|
92c277c |
+ return;
|
|
|
92c277c |
+ }
|
|
|
92c277c |
+#endif
|
|
|
92c277c |
+#ifdef GDK_WINDOWING_X11
|
|
|
92c277c |
if (m_updateDecorSize && memcmp(&m_decorSize, &decorSize, sizeof(DecorSize)))
|
|
|
92c277c |
{
|
|
|
92c277c |
m_useCachedClientSize = false;
|
|
|
92c277c |
@@ -1292,8 +1367,8 @@ void wxTopLevelWindowGTK::GTKUpdateDecorSize(const DecorSize& decorSize)
|
|
|
92c277c |
showEvent.SetEventObject(this);
|
|
|
92c277c |
HandleWindowEvent(showEvent);
|
|
|
92c277c |
}
|
|
|
92c277c |
-}
|
|
|
92c277c |
#endif // GDK_WINDOWING_X11
|
|
|
92c277c |
+}
|
|
|
92c277c |
|
|
|
92c277c |
wxTopLevelWindowGTK::DecorSize& wxTopLevelWindowGTK::GetCachedDecorSize()
|
|
|
92c277c |
{
|