[Libreoffice-commits] core.git: svx/source

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Tue Jul 28 10:12:47 UTC 2020


 svx/source/tbxctrls/tbcontrl.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 9282871ab05721c59f7946879a5f28f2e8af96a1
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Jul 28 09:33:41 2020 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Jul 28 12:11:56 2020 +0200

    Related: tdf#135121 update widebuttons on icon-size change too
    
    as well as the split-buttons. We don't draw into the icon for
    widebuttons, but we do need to draw the icon into the replacement
    wider image so we want to update for widebuttons too
    
    Change-Id: Ia37f7de7faa08e63a498ff474a46a98566930acd
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99575
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 3a1aec034b78..2132939cc141 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -3341,10 +3341,10 @@ void SvxColorToolBoxControl::execute(sal_Int16 /*nSelectModifier*/)
 
 sal_Bool SvxColorToolBoxControl::opensSubToolbar()
 {
-    // For a split button, we mark this controller as a sub-toolbar controller,
-    // so we get notified (through updateImage method) on button image changes,
-    // and could redraw the last used color on top of it.
-    return m_bSplitButton;
+    // We mark this controller as a sub-toolbar controller, so we get notified
+    // (through updateImage method) on button image changes, and could redraw
+    // the last used color on top of it.
+    return true;
 }
 
 void SvxColorToolBoxControl::updateImage()


More information about the Libreoffice-commits mailing list