|
 |
b5e0e7b |
From 88f9c7f53ad1abc49d8ed4cfc46081d767b0c065 Mon Sep 17 00:00:00 2001
|
|
|
505be37 |
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
|
|
505be37 |
Date: Tue, 1 Dec 2015 13:27:21 +0000
|
|
|
505be37 |
Subject: [PATCH] gtk3+wayland: wrong dialog sizes
|
|
|
505be37 |
|
|
|
505be37 |
use inner container, not outer toxic toplevel
|
|
|
505be37 |
|
|
|
505be37 |
Change-Id: I44f2fe1e8e346e51e65158f7864293ef37732345
|
|
|
505be37 |
---
|
|
|
b5e0e7b |
vcl/unx/gtk/window/gtksalframe.cxx | 10 ++++++----
|
|
|
505be37 |
1 file changed, 6 insertions(+), 4 deletions(-)
|
|
|
505be37 |
|
|
|
b5e0e7b |
diff --git a/vcl/unx/gtk/window/gtksalframe.cxx b/vcl/unx/gtk/window/gtksalframe.cxx
|
|
|
b5e0e7b |
index dd03073..99624e0 100644
|
|
|
b5e0e7b |
--- a/vcl/unx/gtk/window/gtksalframe.cxx
|
|
|
b5e0e7b |
+++ b/vcl/unx/gtk/window/gtksalframe.cxx
|
|
|
b5e0e7b |
@@ -950,22 +950,24 @@ void GtkSalFrame::moveWindow( long nX, long nY )
|
|
|
505be37 |
|
|
|
505be37 |
void GtkSalFrame::widget_set_size_request(long nWidth, long nHeight)
|
|
|
505be37 |
{
|
|
|
505be37 |
+#if !GTK_CHECK_VERSION(3,0,0)
|
|
|
505be37 |
gint nOrigwidth, nOrigheight;
|
|
|
505be37 |
gtk_window_get_size(GTK_WINDOW(m_pWindow), &nOrigwidth, &nOrigheight);
|
|
|
505be37 |
-#if !GTK_CHECK_VERSION(3,0,0)
|
|
|
505be37 |
if (nWidth > nOrigwidth || nHeight > nOrigheight)
|
|
|
505be37 |
{
|
|
|
505be37 |
m_bPaintsBlocked = true;
|
|
|
505be37 |
}
|
|
|
505be37 |
-#endif
|
|
|
505be37 |
gtk_widget_set_size_request(m_pWindow, nWidth, nHeight );
|
|
|
505be37 |
+#else
|
|
|
505be37 |
+ gtk_widget_set_size_request(GTK_WIDGET(m_pFixedContainer), nWidth, nHeight );
|
|
|
505be37 |
+#endif
|
|
|
505be37 |
}
|
|
|
505be37 |
|
|
|
505be37 |
void GtkSalFrame::window_resize(long nWidth, long nHeight)
|
|
|
505be37 |
{
|
|
|
505be37 |
+#if !GTK_CHECK_VERSION(3,0,0)
|
|
|
505be37 |
gint nOrigwidth, nOrigheight;
|
|
|
505be37 |
gtk_window_get_size(GTK_WINDOW(m_pWindow), &nOrigwidth, &nOrigheight);
|
|
|
505be37 |
-#if !GTK_CHECK_VERSION(3,0,0)
|
|
|
505be37 |
if (nWidth > nOrigwidth || nHeight > nOrigheight)
|
|
|
505be37 |
{
|
|
|
505be37 |
m_bPaintsBlocked = true;
|
|
|
b5e0e7b |
@@ -1087,7 +1089,7 @@ void GtkSalFrame::InitCommon()
|
|
|
505be37 |
m_aMouseSignalIds.push_back(g_signal_connect( G_OBJECT(pEventWidget), "button-release-event", G_CALLBACK(signalButton), this ));
|
|
|
505be37 |
#if GTK_CHECK_VERSION(3,0,0)
|
|
|
505be37 |
g_signal_connect( G_OBJECT(m_pFixedContainer), "draw", G_CALLBACK(signalDraw), this );
|
|
|
505be37 |
- g_signal_connect( G_OBJECT(m_pWindow), "size-allocate", G_CALLBACK(sizeAllocated), this );
|
|
|
505be37 |
+ g_signal_connect( G_OBJECT(m_pFixedContainer), "size-allocate", G_CALLBACK(sizeAllocated), this );
|
|
|
b5e0e7b |
// g_signal_connect( G_OBJECT(m_pWindow), "state-flags-changed", G_CALLBACK(signalFlagsChanged), this );
|
|
|
505be37 |
#if GTK_CHECK_VERSION(3,14,0)
|
|
|
505be37 |
GtkGesture *pSwipe = gtk_gesture_swipe_new(pEventWidget);
|
|
|
505be37 |
--
|
|
|
505be37 |
2.5.0
|
|
|
505be37 |
|