Fix rename issues in Filezilla with overlay scrollbars disabled (#1381765)

epel8
Scott Talbert 8 years ago
parent 3cf7211485
commit 6ddfa9d786

@ -0,0 +1,47 @@
From 8d7e0d045250fa78a7e7d5a25cecee43bb75db3a Mon Sep 17 00:00:00 2001
From: Paul Cornett <paulcor@bullseye.com>
Date: Mon, 10 Nov 2014 04:13:18 +0000
Subject: [PATCH] fix infinite sizing loop with GTK3 when using a non-default
target window, closes #16668
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@78106 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
docs/changes.txt | 5 +++++
src/gtk/scrolwin.cpp | 8 ++++++++
2 files changed, 13 insertions(+)
diff --git a/docs/changes.txt b/docs/changes.txt
index 6f1e996..0a09cd5 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -581,6 +581,11 @@ All (GUI):
- Fix several floating point rounding bugs in wxPropertyGrid (Artur Wieczorek).
+wxGTK:
+
+- Fix infinite sizing loop with GTK3 when using wxScrolled with a non-default
+ target window.
+
wxMSW:
- Fix compilation with C++Builder XE compiler (Nichka).
diff --git a/src/gtk/scrolwin.cpp b/src/gtk/scrolwin.cpp
index 9b39077..c500288 100644
--- a/src/gtk/scrolwin.cpp
+++ b/src/gtk/scrolwin.cpp
@@ -81,6 +81,14 @@ void wxScrollHelper::AdjustScrollbars()
{
int vw, vh;
m_targetWindow->GetVirtualSize(&vw, &vh);
+#ifdef __WXGTK3__
+ if (m_targetWindow != m_win)
+ {
+ // setting wxPizza preferred size keeps GtkScrolledWindow from causing
+ // an infinite sizing loop
+ gtk_widget_set_size_request(m_win->m_wxwindow, vw, vh);
+ }
+#endif
int w, h;
const wxSize availSize = GetSizeAvailableForScrollTarget(

@ -11,7 +11,7 @@
Name: %{wxgtkname} Name: %{wxgtkname}
Version: 3.0.2 Version: 3.0.2
Release: 27%{?dist} Release: 28%{?dist}
Summary: GTK port of the wxWidgets GUI library Summary: GTK port of the wxWidgets GUI library
License: wxWidgets License: wxWidgets
Group: System Environment/Libraries Group: System Environment/Libraries
@ -91,6 +91,11 @@ Patch17: %{name}-%{version}-draw-elliptic-arc-crash.patch
# https://github.com/wxWidgets/wxWidgets/commit/0f9f942a5bbe0ed9f07ea2e1fef90a7e2db768e5 # https://github.com/wxWidgets/wxWidgets/commit/0f9f942a5bbe0ed9f07ea2e1fef90a7e2db768e5
Patch18: %{name}-%{version}-fix-percent-dnd.patch Patch18: %{name}-%{version}-fix-percent-dnd.patch
Patch19: %{name}-%{version}-fix-percent-dnd2.patch Patch19: %{name}-%{version}-fix-percent-dnd2.patch
# Fixes rename issues in Filezilla with overlay scrollbars disabled - note: the
# size-alloc-fix patch is also required.
# For more details, see the upstream commit:
# https://github.com/wxWidgets/wxWidgets/commit/8d7e0d045250fa78a7e7d5a25cecee43bb75db3a
Patch20: %{name}-%{version}-scrolwin-sizing-loop.patch
BuildRequires: gtk%{gtkver}-devel BuildRequires: gtk%{gtkver}-devel
#Note webkitgtk (GTK2) does not appear to be supported #Note webkitgtk (GTK2) does not appear to be supported
@ -392,6 +397,9 @@ fi
%doc docs/doxygen/out/xml/* %doc docs/doxygen/out/xml/*
%changelog %changelog
* Mon Oct 10 2016 Scott Talbert <swt@techie.net> - 3.0.2-28
- Fix rename issues in Filezilla with overlay scrollbars disabled (#1381765)
* Sat Oct 08 2016 Scott Talbert <swt@techie.net> - 3.0.2-27 * Sat Oct 08 2016 Scott Talbert <swt@techie.net> - 3.0.2-27
- Add a -webview subpackage in F26+ - Add a -webview subpackage in F26+

Loading…
Cancel
Save