summaryrefslogtreecommitdiff
path: root/vcl/source/window
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-12-16 10:46:10 +0000
committerEike Rathke <erack@redhat.com>2016-03-14 18:52:39 +0000
commit1f061d64989f74ea517f9e4951fc856211e7d9f0 (patch)
tree887caff7e695f794b3f7afa6cf38b5e9035da50b /vcl/source/window
parent4c9b861e43ea6efc193107a25def6a748994ad5b (diff)
Related: tdf#98419 set a min size on un-resizeable non-layout dialogs
(see also rhbz#1281906) a min size equates to a size-request which is reliable under gtk3+wayland as the dialog contents size. a default size equates to the size of the dialog, which includes decorations under wayland (cherry picked from commit afeddaf7e0d11ad9b1df0c80bcc3f50caa87e21a) Change-Id: I20baf00fb5952ab93628f4dd6891779ce682783c Reviewed-on: https://gerrit.libreoffice.org/23121 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'vcl/source/window')
-rw-r--r--vcl/source/window/syswin.cxx4
1 files changed, 4 insertions, 0 deletions
diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx
index a167c69957cc..3a0c2852d141 100644
--- a/vcl/source/window/syswin.cxx
+++ b/vcl/source/window/syswin.cxx
@@ -1128,6 +1128,10 @@ void SystemWindow::DoInitialLayout()
mbIsCalculatingInitialLayoutSize = false;
mbInitialLayoutDone = true;
}
+ else if (!(GetStyle() & WB_SIZEABLE))
+ {
+ SetMinOutputSizePixel(GetSizePixel());
+ }
}
void SystemWindow::doDeferredInit(WinBits /*nBits*/)