diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-11-15 15:05:44 +0000 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-11-23 11:34:45 +0000 |
| commit | 37ded4ac7b1fe91bb08eaada29d3514570432073 (patch) | |
| tree | d81c776a751c4afafff979ae39317fb0b7bbd51d | |
| parent | 5210e1ba38bfe996a888f21673640de13b49508b (diff) | |
Resolves: tdf#102957 revert SetMinOutputSizePixel workaround
of
commit afeddaf7e0d11ad9b1df0c80bcc3f50caa87e21a
Author: Caolán McNamara <caolanm@redhat.com>
Date: Wed Dec 16 10:46:10 2015 +0000
Related: rhbz#1281906 set a min size on un-resizeable non-layout dialogs
and using a mixture of gtk_window_set_default_size before its visible, and
gtk_window_set_default_size + gtk_window_resize after its shown now works for
me under wayland so the original problem can be solved that way
Change-Id: Iaf8fd3019a7e902ad07b6825f919c6f25288e9b7
(cherry picked from commit 7e2ef433d29fca84ed27a9203b5761dc8dbd8bf8)
Reviewed-on: https://gerrit.libreoffice.org/30875
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
| -rw-r--r-- | vcl/source/window/syswin.cxx | 4 | ||||
| -rw-r--r-- | vcl/unx/gtk3/gtk3gtkframe.cxx | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx index 660328b99825..6603de28600a 100644 --- a/vcl/source/window/syswin.cxx +++ b/vcl/source/window/syswin.cxx @@ -1113,10 +1113,6 @@ void SystemWindow::DoInitialLayout() mbIsCalculatingInitialLayoutSize = false; mbInitialLayoutDone = true; } - else if (IsDialog() && !(GetStyle() & WB_SIZEABLE)) - { - SetMinOutputSizePixel(GetSizePixel()); - } } void SystemWindow::doDeferredInit(WinBits /*nBits*/) diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx index ecd77eeb5229..d74f7b87d3e5 100644 --- a/vcl/unx/gtk3/gtk3gtkframe.cxx +++ b/vcl/unx/gtk3/gtk3gtkframe.cxx @@ -884,7 +884,9 @@ void GtkSalFrame::window_resize(long nWidth, long nHeight) { m_nWidthRequest = nWidth; m_nHeightRequest = nHeight; - gtk_window_resize(GTK_WINDOW(m_pWindow), nWidth, nHeight); + gtk_window_set_default_size(GTK_WINDOW(m_pWindow), nWidth, nHeight); + if (gtk_widget_get_visible(m_pWindow)) + gtk_window_resize(GTK_WINDOW(m_pWindow), nWidth, nHeight); } void GtkSalFrame::resizeWindow( long nWidth, long nHeight ) |