mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

revert action button changes to UNO XStyleSetting

Browse Source 
As there is no need for this UNO changes instead set the values
with other appropriate button settings so the previous behaviour
is retained.

Change-Id: I5952a9ce9f2f72faeb12a7a945c53ed048719b27
Reviewed-on: https://gerrit.libreoffice.org/82620
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
This commit is contained in:
Tomaž Vajngerl 2019-11-13 15:33:27 +01:00 committed by Tomaž Vajngerl
parent 0f0cd9f6dd
commit c1fb36e477
3 changed files with 11 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
offapi/com/sun/star/awt/XStyleSettings.idl
View File

@ -61,18 +61,9 @@ interface XStyleSettings
/// specifies the color to use for text on buttons which are hovered with the mouse
[attribute] ::com::sun::star::util::Color ButtonRolloverTextColor;
/// specifies the color to use for text on action buttons which are hovered with the mouse
[attribute] ::com::sun::star::util::Color ActionButtonRolloverTextColor;
/// specifies the color to use for text on buttons
[attribute] ::com::sun::star::util::Color ButtonTextColor;
/// specifies the color to use for text on a default action buttons
[attribute] ::com::sun::star::util::Color DefaultActionButtonTextColor;
/// specifies the color to use for text on action buttons
[attribute] ::com::sun::star::util::Color ActionButtonTextColor;
[attribute] ::com::sun::star::util::Color CheckedColor;

50
toolkit/source/awt/stylesettings.cxx
View File

@ -236,19 +236,11 @@ namespace toolkit
{
StyleMethodGuard aGuard( *m_pData );
lcl_setStyleColor( *m_pData, &StyleSettings::SetButtonRolloverTextColor, _buttonrollovertextcolor );
}
::sal_Int32 SAL_CALL WindowStyleSettings::getActionButtonRolloverTextColor()
{
StyleMethodGuard aGuard( *m_pData );
return lcl_getStyleColor( *m_pData, &StyleSettings::GetActionButtonRolloverTextColor );
}
void SAL_CALL WindowStyleSettings::setActionButtonRolloverTextColor( ::sal_Int32 _buttonrollovertextcolor )
{
StyleMethodGuard aGuard( *m_pData );
// Also need to set ActionButtonRolloverTextColor as this setting can't be
// set through the UNO interface otherwise.
// Previously this setting was used to set colors for both scenarios,
// but action button setting was added to differentiate the buttons from
// "normal" buttons in some themes.
lcl_setStyleColor( *m_pData, &StyleSettings::SetActionButtonRolloverTextColor, _buttonrollovertextcolor );
}
@ -264,33 +256,13 @@ namespace toolkit
{
StyleMethodGuard aGuard( *m_pData );
lcl_setStyleColor( *m_pData, &StyleSettings::SetButtonTextColor, _buttontextcolor );
}
::sal_Int32 SAL_CALL WindowStyleSettings::getDefaultActionButtonTextColor()
{
StyleMethodGuard aGuard( *m_pData );
return lcl_getStyleColor( *m_pData, &StyleSettings::GetDefaultActionButtonTextColor );
}
void SAL_CALL WindowStyleSettings::setDefaultActionButtonTextColor( ::sal_Int32 _buttontextcolor )
{
StyleMethodGuard aGuard( *m_pData );
lcl_setStyleColor( *m_pData, &StyleSettings::SetDefaultActionButtonTextColor, _buttontextcolor );
}
::sal_Int32 SAL_CALL WindowStyleSettings::getActionButtonTextColor()
{
StyleMethodGuard aGuard( *m_pData );
return lcl_getStyleColor( *m_pData, &StyleSettings::GetActionButtonTextColor );
}
void SAL_CALL WindowStyleSettings::setActionButtonTextColor( ::sal_Int32 _buttontextcolor )
{
StyleMethodGuard aGuard( *m_pData );
// Also need to set ActionButtonTextColor and DefaultActionButtonTextColor
// as this two settings can't be set through the UNO interface otherwise.
// Previously this setting was used to set colors for all three scenarios,
// but action button setting was added to differentiate the buttons from
// "normal" buttons in some themes.
lcl_setStyleColor( *m_pData, &StyleSettings::SetActionButtonTextColor, _buttontextcolor );
lcl_setStyleColor( *m_pData, &StyleSettings::SetDefaultActionButtonTextColor, _buttontextcolor );
}

6
toolkit/source/awt/stylesettings.hxx
View File

@ -62,14 +62,8 @@ namespace toolkit
virtual void SAL_CALL setActiveTextColor( ::sal_Int32 _activetextcolor ) override;
virtual ::sal_Int32 SAL_CALL getButtonRolloverTextColor() override;
virtual void SAL_CALL setButtonRolloverTextColor( ::sal_Int32 _buttonrollovertextcolor ) override;
virtual ::sal_Int32 SAL_CALL getActionButtonRolloverTextColor() override;
virtual void SAL_CALL setActionButtonRolloverTextColor( ::sal_Int32 _buttonrollovertextcolor ) override;
virtual ::sal_Int32 SAL_CALL getButtonTextColor() override;
virtual void SAL_CALL setButtonTextColor( ::sal_Int32 _buttontextcolor ) override;
virtual ::sal_Int32 SAL_CALL getDefaultActionButtonTextColor() override;
virtual void SAL_CALL setDefaultActionButtonTextColor( ::sal_Int32 _buttontextcolor ) override;
virtual ::sal_Int32 SAL_CALL getActionButtonTextColor() override;
virtual void SAL_CALL setActionButtonTextColor( ::sal_Int32 _buttontextcolor ) override;
virtual ::sal_Int32 SAL_CALL getCheckedColor() override;
virtual void SAL_CALL setCheckedColor( ::sal_Int32 _checkedcolor ) override;
virtual ::sal_Int32 SAL_CALL getDarkShadowColor() override;