|
 |
69cc7b |
From 98d7e0917f0e434e1e291e1d741715cd90161dc5 Mon Sep 17 00:00:00 2001
|
|
|
69cc7b |
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
|
|
69cc7b |
Date: Tue, 29 Aug 2017 14:01:09 +0100
|
|
|
69cc7b |
Subject: [PATCH] Resolves: rhbz#1400287 resizing properties dialog hides
|
|
|
69cc7b |
widgets
|
|
|
69cc7b |
MIME-Version: 1.0
|
|
|
69cc7b |
Content-Type: text/plain; charset=UTF-8
|
|
|
69cc7b |
Content-Transfer-Encoding: 8bit
|
|
|
69cc7b |
|
|
|
69cc7b |
Change-Id: I5d066f53c5bdfb4dd50d60c5cb4b66e425c0293c
|
|
|
69cc7b |
Reviewed-on: https://gerrit.libreoffice.org/41696
|
|
|
69cc7b |
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
|
|
|
69cc7b |
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
|
69cc7b |
(cherry picked from commit 57d3e8b35d18c6fb329badbab8a8c28020253a40)
|
|
|
69cc7b |
---
|
|
|
69cc7b |
sfx2/source/dialog/dinfdlg.cxx | 12 +++++++-----
|
|
|
69cc7b |
1 file changed, 7 insertions(+), 5 deletions(-)
|
|
|
69cc7b |
|
|
|
69cc7b |
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
|
|
|
69cc7b |
index b2bcbf2..f8dc73d 100644
|
|
|
69cc7b |
--- a/sfx2/source/dialog/dinfdlg.cxx
|
|
|
69cc7b |
+++ b/sfx2/source/dialog/dinfdlg.cxx
|
|
|
69cc7b |
@@ -1505,6 +1505,7 @@ CustomPropertiesWindow::CustomPropertiesWindow(vcl::Window* pParent,
|
|
|
69cc7b |
m_aDurationField->SetPosSizePixel(aPos, aSize);
|
|
|
69cc7b |
m_aDateField->SetPosSizePixel(aPos, aSize);
|
|
|
69cc7b |
m_aTimeField->SetPosSizePixel(aPos, aSize);
|
|
|
69cc7b |
+ m_aYesNoButton->SetPosSizePixel(aPos, aSize);
|
|
|
69cc7b |
|
|
|
69cc7b |
m_aEditLoseFocusIdle.SetPriority( SchedulerPriority::LOWEST );
|
|
|
69cc7b |
m_aEditLoseFocusIdle.SetIdleHdl( LINK( this, CustomPropertiesWindow, EditTimeoutHdl ) );
|
|
|
69cc7b |
@@ -1795,12 +1796,13 @@ void CustomPropertiesWindow::updateLineWidth()
|
|
|
69cc7b |
|
|
|
69cc7b |
vcl::Window** pCurrent = pWindows;
|
|
|
69cc7b |
vcl::Window** pNewCurrent = pNewWindows;
|
|
|
69cc7b |
- while ( *pCurrent )
|
|
|
69cc7b |
+ while (*pCurrent)
|
|
|
69cc7b |
{
|
|
|
69cc7b |
- Size aSize = (*pCurrent)->GetSizePixel();
|
|
|
69cc7b |
- Point aPos = (*pCurrent)->GetPosPixel();
|
|
|
69cc7b |
- aPos.Y() = (*pNewCurrent)->GetPosPixel().Y();
|
|
|
69cc7b |
- (*pNewCurrent)->SetPosSizePixel( aPos, aSize );
|
|
|
69cc7b |
+ Size aSize = (*pNewCurrent)->GetSizePixel();
|
|
|
69cc7b |
+ aSize.Width() = (*pCurrent)->GetSizePixel().Width();
|
|
|
69cc7b |
+ Point aPos = (*pNewCurrent)->GetPosPixel();
|
|
|
69cc7b |
+ aPos.X() = (*pCurrent)->GetPosPixel().X();
|
|
|
69cc7b |
+ (*pNewCurrent)->SetPosSizePixel(aPos, aSize);
|
|
|
69cc7b |
pCurrent++;
|
|
|
69cc7b |
pNewCurrent++;
|
|
|
69cc7b |
}
|
|
|
69cc7b |
--
|
|
|
69cc7b |
2.9.4
|
|
|
69cc7b |
|