| 1 |
From 86692366b7edbd6dd1ce329a172fb78d402ac328 Mon Sep 17 00:00:00 2001 |
| 2 |
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com> |
| 3 |
Date: Wed, 9 Mar 2016 11:01:43 +0000 |
| 4 |
Subject: [PATCH] Resolves: rhbz#1315385 use preferred size if widget supports |
| 5 |
it |
| 6 |
|
| 7 |
when deciding if a popup needs to be placed up or down to stay |
| 8 |
visible on screen |
| 9 |
|
| 10 |
Change-Id: I718e0ee4a79152e919ac95841e15d4b53764ac78 |
| 11 |
--- |
| 12 |
vcl/source/window/floatwin.cxx | 2 +- |
| 13 |
1 file changed, 1 insertion(+), 1 deletion(-) |
| 14 |
|
| 15 |
diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx |
| 16 |
index 00c3b34..6553f94 100644 |
| 17 |
--- a/vcl/source/window/floatwin.cxx |
| 18 |
+++ b/vcl/source/window/floatwin.cxx |
| 19 |
@@ -244,7 +244,7 @@ Point FloatingWindow::ImplCalcPos( vcl::Window* pWindow, |
| 20 |
{ |
| 21 |
// get window position |
| 22 |
Point aPos; |
| 23 |
- Size aSize = pWindow->GetSizePixel(); |
| 24 |
+ Size aSize = ::isLayoutEnabled(pWindow) ? pWindow->get_preferred_size() : pWindow->GetSizePixel(); |
| 25 |
Rectangle aScreenRect = pWindow->ImplGetFrameWindow()->GetDesktopRectPixel(); |
| 26 |
FloatingWindow *pFloatingWindow = dynamic_cast<FloatingWindow*>( pWindow ); |
| 27 |
|
| 28 |
-- |
| 29 |
2.7.1 |
| 30 |
|
Parent Directory
| 
Revision Log