diff options
| author | Michael Weghorn <m.weghorn@posteo.de> | 2024-07-24 06:40:59 +0200 |
|---|---|---|
| committer | Michael Weghorn <m.weghorn@posteo.de> | 2024-07-24 14:44:46 +0200 |
| commit | b3626b0142fc8b72d2249279c34badbb971addce (patch) | |
| tree | a688ff2a43f202f6d37a22f1cdf85ce589ff932c | |
| parent | 282da64a8fbcc71b59479bf13820a0b93c5f5889 (diff) | |
tdf#161501 icon choice ctrl: Drop WB_HIGHLIGHTFRAME
It is always set, so no need to have an
icon choice control specific window bit to
specify whether or not to highlight the
currently mouse-hovered entry. Just always
do it.
Change-Id: Ib259b6b1576e1968221c4f98661a3a93e600c93b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170922
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
| -rw-r--r-- | include/vcl/toolkit/ivctrl.hxx | 2 | ||||
| -rw-r--r-- | vcl/source/control/imivctl1.cxx | 13 | ||||
| -rw-r--r-- | vcl/source/control/ivctrl.cxx | 2 |
3 files changed, 5 insertions, 12 deletions
diff --git a/include/vcl/toolkit/ivctrl.hxx b/include/vcl/toolkit/ivctrl.hxx index 9d0822fa4d6c..0340eacf164e 100644 --- a/include/vcl/toolkit/ivctrl.hxx +++ b/include/vcl/toolkit/ivctrl.hxx @@ -102,7 +102,6 @@ public: WB_NODRAGSELECTION // No selection with tracking rectangle WB_NOCOLUMNHEADER // No Headerbar in Details view (Headerbar not implemented) WB_NOPOINTERFOCUS // No GrabFocus at MouseButtonDown - WB_HIGHLIGHTFRAME // The entry beneath the mouse will be highlighted */ #define WB_ICON WB_RECTSTYLE @@ -112,7 +111,6 @@ public: #define WB_NOVSCROLL WB_DRAG #define WB_NODRAGSELECTION WB_PATHELLIPSIS #define WB_NOCOLUMNHEADER WB_CENTER -#define WB_HIGHLIGHTFRAME WB_IGNORETAB class MnemonicGenerator; diff --git a/vcl/source/control/imivctl1.cxx b/vcl/source/control/imivctl1.cxx index 22e41a967470..ed4c2faa8abe 100644 --- a/vcl/source/control/imivctl1.cxx +++ b/vcl/source/control/imivctl1.cxx @@ -491,17 +491,12 @@ bool SvxIconChoiceCtrl_Impl::MouseButtonDown( const MouseEvent& rMEvt) bool SvxIconChoiceCtrl_Impl::MouseMove( const MouseEvent& rMEvt ) { - const Point aDocPos( pView->PixelToLogic(rMEvt.GetPosPixel()) ); - if( pView->IsTracking() ) return false; - else if( nWinBits & WB_HIGHLIGHTFRAME ) - { - SvxIconChoiceCtrlEntry* pEntry = GetEntry( aDocPos ); - SetEntryHighlightFrame(pEntry); - } - else - return false; + + const Point aDocPos(pView->PixelToLogic(rMEvt.GetPosPixel())); + SvxIconChoiceCtrlEntry* pEntry = GetEntry(aDocPos); + SetEntryHighlightFrame(pEntry); return true; } diff --git a/vcl/source/control/ivctrl.cxx b/vcl/source/control/ivctrl.cxx index ba35056e7588..4566ad1310b9 100644 --- a/vcl/source/control/ivctrl.cxx +++ b/vcl/source/control/ivctrl.cxx @@ -369,7 +369,7 @@ struct VerticalTabPageData VerticalTabControl::VerticalTabControl(vcl::Window* pParent, bool bWithIcons) : VclHBox(pParent) , m_xChooser(VclPtr<SvtIconChoiceCtrl>::Create(this, WB_3DLOOK | (bWithIcons ? WB_ICON : WB_DETAILS) | WB_BORDER | - WB_NOCOLUMNHEADER | WB_HIGHLIGHTFRAME | + WB_NOCOLUMNHEADER | WB_NODRAGSELECTION | WB_TABSTOP | WB_CLIPCHILDREN | WB_NOHSCROLL)) , m_xBox(VclPtr<VclVBox>::Create(this)) |