Blame wxGTK3-3.0.2-getbestsize.patch
|
 |
2103d41 |
From 2bc3721f065fd7d47674ccaf7e8d9d6cc195aab5 Mon Sep 17 00:00:00 2001
|
|
|
2103d41 |
From: Paul Cornett <paulcor@users.noreply.github.com>
|
|
|
2103d41 |
Date: Sat, 6 Feb 2016 08:58:53 -0800
|
|
|
2103d41 |
Subject: [PATCH] Fix GetBestSize() for GTK3 after size has been set
|
|
|
2103d41 |
|
|
|
2103d41 |
Need to reset size request to get actual best size.
|
|
|
2103d41 |
See Fedora bug https://bugzilla.redhat.com/show_bug.cgi?id=1282142
|
|
|
2103d41 |
|
|
|
2103d41 |
(cherry picked from commit 6ed7e27bf270f9f7767b59ebaa9a7f37c5bb3bed)
|
|
|
2103d41 |
---
|
|
|
2103d41 |
src/gtk/control.cpp | 4 ++++
|
|
|
2103d41 |
1 file changed, 4 insertions(+)
|
|
|
2103d41 |
|
|
|
2103d41 |
diff --git a/src/gtk/control.cpp b/src/gtk/control.cpp
|
|
|
2103d41 |
index 3352965..20cd746 100644
|
|
|
2103d41 |
--- a/src/gtk/control.cpp
|
|
|
2103d41 |
+++ b/src/gtk/control.cpp
|
|
|
2103d41 |
@@ -319,7 +319,11 @@ wxSize wxControl::GTKGetPreferredSize(GtkWidget* widget) const
|
|
|
2103d41 |
{
|
|
|
2103d41 |
GtkRequisition req;
|
|
|
2103d41 |
#ifdef __WXGTK3__
|
|
|
2103d41 |
+ int w, h;
|
|
|
2103d41 |
+ gtk_widget_get_size_request(widget, &w, &h);
|
|
|
2103d41 |
+ gtk_widget_set_size_request(widget, -1, -1);
|
|
|
2103d41 |
gtk_widget_get_preferred_size(widget, NULL, &req;;
|
|
|
2103d41 |
+ gtk_widget_set_size_request(widget, w, h);
|
|
|
2103d41 |
#else
|
|
|
2103d41 |
GTK_WIDGET_GET_CLASS(widget)->size_request(widget, &req;;
|
|
|
2103d41 |
#endif
|