summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-03-09 11:01:43 +0000
committerCaolán McNamara <caolanm@redhat.com>2016-03-09 11:02:34 +0000
commit86692366b7edbd6dd1ce329a172fb78d402ac328 (patch)
treea36fe202807bbc860d7397c248004cff83ae5587 /vcl
parent68c656a130d78322e7098478ff7ad5bdcabc2645 (diff)
Resolves: rhbz#1315385 use preferred size if widget supports it
when deciding if a popup needs to be placed up or down to stay visible on screen Change-Id: I718e0ee4a79152e919ac95841e15d4b53764ac78
Diffstat (limited to 'vcl')
-rw-r--r--vcl/source/window/floatwin.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx
index 00c3b34f0388..6553f947440c 100644
--- a/vcl/source/window/floatwin.cxx
+++ b/vcl/source/window/floatwin.cxx
@@ -244,7 +244,7 @@ Point FloatingWindow::ImplCalcPos( vcl::Window* pWindow,
{
// get window position
Point aPos;
- Size aSize = pWindow->GetSizePixel();
+ Size aSize = ::isLayoutEnabled(pWindow) ? pWindow->get_preferred_size() : pWindow->GetSizePixel();
Rectangle aScreenRect = pWindow->ImplGetFrameWindow()->GetDesktopRectPixel();
FloatingWindow *pFloatingWindow = dynamic_cast<FloatingWindow*>( pWindow );