diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-01-11 17:09:10 +0000 |
|---|---|---|
| committer | Adolfo Jayme Barrientos <fitojb@ubuntu.com> | 2020-01-12 05:33:49 +0100 |
| commit | 2abea1b94e0f99b3887e816db006c11bfd72d010 (patch) | |
| tree | 9b0cc8d10a14be0c90ff258a56bf0c265d2b98a1 /svx/source | |
| parent | 52ac526a61c1a26bb9dbf995f4af02c9469b8cf6 (diff) | |
Resolves: tdf#129763 resize to request happening on every activate
even though the state remains the same, so only do the resize
if the EnableClearFormatButton[All] state changes.
also change the default to off, which is what writer typically
set it to, and make calc the one that enables it explicitly. Its
easier to grow a dialog than shrink a dialog.
Change-Id: I449df7b7dcf0204b5143b8ad88e528668b84d0a3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86614
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Diffstat (limited to 'svx/source')
| -rw-r--r-- | svx/source/dialog/ctredlin.cxx | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx index f5defbb30ba8..15155c6c6edc 100644 --- a/svx/source/dialog/ctredlin.cxx +++ b/svx/source/dialog/ctredlin.cxx @@ -304,6 +304,8 @@ SvxTPView::SvxTPView(weld::Container* pParent, weld::Window* pDialog, weld::Buil , bEnableReject(true) , bEnableRejectAll(true) , bEnableUndo(true) + , bEnableClearFormat(false) + , bEnableClearFormatAll(false) , m_pDialog(pDialog) , m_xAccept(pTopLevel->weld_button("accept")) , m_xReject(pTopLevel->weld_button("reject")) @@ -313,11 +315,6 @@ SvxTPView::SvxTPView(weld::Container* pParent, weld::Window* pDialog, weld::Buil , m_xViewData(new SvxRedlinTable(m_xBuilder->weld_tree_view("writerchanges"), m_xBuilder->weld_tree_view("calcchanges"))) { - // set wider window for the optional extending button labels - // eg. "Reject/Clear formatting" instead of "Reject" - EnableClearFormat(true); - EnableClearFormatAll(true); - Size aControlSize(80, 65); m_xViewData->set_size_request(aControlSize.Width(), aControlSize.Height()); @@ -440,12 +437,18 @@ void SvxTPView::EnableClearFormatButton(weld::Button& rButton, bool bFlag) void SvxTPView::EnableClearFormat(bool bFlag) { + if (bEnableClearFormat == bFlag) + return; EnableClearFormatButton(*m_xReject, bFlag); + bEnableClearFormat = bFlag; } void SvxTPView::EnableClearFormatAll(bool bFlag) { + if (bEnableClearFormatAll == bFlag) + return; EnableClearFormatButton(*m_xRejectAll, bFlag); + bEnableClearFormatAll = bFlag; } void SvxTPView::ShowUndo() |