diff options
| author | Isamu Mogi <saturday6c@gmail.com> | 2013-05-17 11:00:39 +0000 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2013-05-27 13:35:51 +0200 |
| commit | 65aba2fd729af52a56abb598a07c9d341adb738a (patch) | |
| tree | 954a9b7cec40e93f61bc6658d15f8a72beab0587 /include | |
| parent | 7855cd6704c864911d97b73f8c46d712975ec9b5 (diff) | |
Add mouse rollover effect to menubar on KDE and Windows
- Add mouse rollover handling code to vcl::MenuBarWindow and vcl::Menu
- Add member variable of rollover color to StyleSettings and ImplStyleData
- Add rollover color definitions for each platforms
Change-Id: I9ececd8a7089918ac63c5f2027c0c2f361a9d227
Reviewed-on: https://gerrit.libreoffice.org/3856
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
Signed-off-by: Luboš Luňák <l.lunak@suse.cz>
Diffstat (limited to 'include')
| -rw-r--r-- | include/vcl/menu.hxx | 2 | ||||
| -rw-r--r-- | include/vcl/settings.hxx | 10 |
2 files changed, 11 insertions, 1 deletions
diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx index d0f0c0c08988..38f301d9bc34 100644 --- a/include/vcl/menu.hxx +++ b/include/vcl/menu.hxx @@ -155,7 +155,7 @@ protected: SAL_DLLPRIVATE sal_uInt16 ImplGetFirstVisible() const; SAL_DLLPRIVATE sal_uInt16 ImplGetPrevVisible( sal_uInt16 nPos ) const; SAL_DLLPRIVATE sal_uInt16 ImplGetNextVisible( sal_uInt16 nPos ) const; - SAL_DLLPRIVATE void ImplPaint( Window* pWin, sal_uInt16 nBorder, long nOffY = 0, MenuItemData* pThisDataOnly = 0, sal_Bool bHighlighted = sal_False, bool bLayout = false ) const; + SAL_DLLPRIVATE void ImplPaint( Window* pWin, sal_uInt16 nBorder, long nOffY = 0, MenuItemData* pThisDataOnly = 0, sal_Bool bHighlighted = sal_False, bool bLayout = false, bool bRollover = false ) const; SAL_DLLPRIVATE void ImplSelect(); SAL_DLLPRIVATE void ImplCallHighlight( sal_uInt16 nHighlightItem ); SAL_DLLPRIVATE void ImplCallEventListeners( sal_uLong nEvent, sal_uInt16 nPos ); diff --git a/include/vcl/settings.hxx b/include/vcl/settings.hxx index 2c861cdb356c..4a7cdf8fc7e6 100644 --- a/include/vcl/settings.hxx +++ b/include/vcl/settings.hxx @@ -278,12 +278,14 @@ private: Color maLightColor; Color maLinkColor; Color maMenuBarColor; + Color maMenuBarRolloverColor; Color maMenuBorderColor; Color maMenuColor; Color maMenuHighlightColor; Color maMenuHighlightTextColor; Color maMenuTextColor; Color maMenuBarTextColor; + Color maMenuBarRolloverTextColor; Color maMonoColor; Color maRadioCheckTextColor; Color maShadowColor; @@ -581,6 +583,10 @@ public: { CopyData(); mpData->maMenuBarColor = rColor; } const Color& GetMenuBarColor() const { return mpData->maMenuBarColor; } + void SetMenuBarRolloverColor( const Color& rColor ) + { CopyData(); mpData->maMenuBarRolloverColor = rColor; } + const Color& GetMenuBarRolloverColor() const + { return mpData->maMenuBarRolloverColor; } void SetMenuBorderColor( const Color& rColor ) { CopyData(); mpData->maMenuBorderColor = rColor; } const Color& GetMenuBorderColor() const @@ -593,6 +599,10 @@ public: { CopyData(); mpData->maMenuBarTextColor = rColor; } const Color& GetMenuBarTextColor() const { return mpData->maMenuBarTextColor; } + void SetMenuBarRolloverTextColor( const Color& rColor ) + { CopyData(); mpData->maMenuBarRolloverTextColor = rColor; } + const Color& GetMenuBarRolloverTextColor() const + { return mpData->maMenuBarRolloverTextColor; } void SetMenuHighlightColor( const Color& rColor ) { CopyData(); mpData->maMenuHighlightColor = rColor; } const Color& GetMenuHighlightColor() const |