diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-11-04 13:04:00 +0000 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-11-26 19:35:02 +0000 |
| commit | 6213ce4ab8621ad307df25c1fd2bfeb8de5dd1f6 (patch) | |
| tree | 69f8cb3c6ff7bcf49366627cf67682c6dfcaed02 /cui/source/tabpages/autocdlg.cxx | |
| parent | 273be431c62aaf5fabe218cae57e8f3f9fe049e1 (diff) | |
Resolves: tdf#95352 resize the columns when the edits reposition
instead of assuming they are in their final position when the
top level dialog resizes. Cause there's a timer/idle involved
so the final position isn't known yet
(cherry picked from commit d4d4e00a5a449bdf46608ce0cecbfa07c340e555)
Change-Id: I713e938b0e275f181514315cb4ce4531f36191ca
loplugin:vclwidgets
(cherry picked from commit 4882664e39718109e2ae80348da8b914eb8b2ae6)
Change-Id: I3e5d88bdc2ecae6164c75da8ddf1b8cfe0ed325f
Reviewed-on: https://gerrit.libreoffice.org/19796
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'cui/source/tabpages/autocdlg.cxx')
| -rw-r--r-- | cui/source/tabpages/autocdlg.cxx | 47 |
1 files changed, 26 insertions, 21 deletions
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index c720d6725028..5b06d926069d 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -906,28 +906,9 @@ OfaAutocorrReplacePage::OfaAutocorrReplacePage( vcl::Window* pParent, m_pReplaceED->SetSpaces(true); m_pShortED->SetSpaces(true); -} - -void OfaAutocorrReplacePage::setTabs() -{ - m_pReplaceTLB->SetTab(0, m_pShortED->GetPosPixel().X(), MAP_PIXEL); - m_pReplaceTLB->SetTab(1, m_pReplaceED->GetPosPixel().X(), MAP_PIXEL); -} - -void OfaAutocorrReplacePage::StateChanged(StateChangedType nStateChange) -{ - SfxTabPage::StateChanged(nStateChange); - if (nStateChange == StateChangedType::InitShow) - { - setTabs(); - } -} - -void OfaAutocorrReplacePage::Resize() -{ - SfxTabPage::Resize(); - setTabs(); + m_pShortED->ConnectColumn(m_pReplaceTLB, 0); + m_pReplaceED->ConnectColumn(m_pReplaceTLB, 1); } OfaAutocorrReplacePage::~OfaAutocorrReplacePage() @@ -1752,6 +1733,22 @@ IMPL_LINK(OfaAutocorrExceptPage, ModifyHdl, Edit*, pEdt) VCL_BUILDER_FACTORY(AutoCorrEdit) +void AutoCorrEdit::dispose() +{ + m_xReplaceTLB.disposeAndClear(); + Edit::dispose(); +} + +AutoCorrEdit::~AutoCorrEdit() { + disposeOnce(); +} + +void AutoCorrEdit::ConnectColumn(const VclPtr<SvTabListBox>& rTable, sal_Int32 nCol) +{ + m_xReplaceTLB = rTable; + m_nCol = nCol; +} + void AutoCorrEdit::KeyInput( const KeyEvent& rKEvt ) { const vcl::KeyCode aKeyCode = rKEvt.GetKeyCode(); @@ -1767,6 +1764,14 @@ void AutoCorrEdit::KeyInput( const KeyEvent& rKEvt ) Edit::KeyInput(rKEvt); } +void AutoCorrEdit::Resize() +{ + Edit::Resize(); + if (!m_xReplaceTLB) + return; + m_xReplaceTLB->SetTab(m_nCol, GetPosPixel().X(), MAP_PIXEL); +} + enum OfaQuoteOptions { ADD_NONBRK_SPACE, |