diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-11-15 13:04:16 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-11-15 13:23:44 +0000 |
| commit | 1aeff41c4a6b16a2ec69faf4a0bee301bd609101 (patch) | |
| tree | 6181aec00aa4f6b69c297a03257586de4933c885 /vcl | |
| parent | 0d051730156f633150fa9e3107fe97cf7be6d8f9 (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 setting a size-request seems to do the right thing for me now under wayland
so the original problem can be solved that way
Change-Id: Ie2dd71c5a32131a60729448f0665d5cae2a83692
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/window/syswin.cxx | 4 | ||||
| -rw-r--r-- | vcl/unx/gtk3/gtk3gtkframe.cxx | 1 |
2 files changed, 1 insertions, 4 deletions
diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx index f7732910df1b..e7e6683b74e5 100644 --- a/vcl/source/window/syswin.cxx +++ b/vcl/source/window/syswin.cxx @@ -1162,10 +1162,6 @@ void SystemWindow::DoInitialLayout() setOptimalLayoutSize(); mbIsCalculatingInitialLayoutSize = false; } - 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 3a1fb9a21fc1..ad4adf440ad3 100644 --- a/vcl/unx/gtk3/gtk3gtkframe.cxx +++ b/vcl/unx/gtk3/gtk3gtkframe.cxx @@ -901,6 +901,7 @@ void GtkSalFrame::window_resize(long nWidth, long nHeight) { m_nWidthRequest = nWidth; m_nHeightRequest = nHeight; + widget_set_size_request(nWidth, nHeight); gtk_window_resize(GTK_WINDOW(m_pWindow), nWidth, nHeight); } |