diff options
| author | Jim Raykowski <raykowj@gmail.com> | 2018-02-09 16:50:22 -0900 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2018-02-18 02:12:08 +0100 |
| commit | 10496770a6c4ba870787f20a4f0948c30e3d59cd (patch) | |
| tree | 2a2d627f4bf37d2157243ddd25336b5ae8799de5 /vcl/source | |
| parent | 77ec366385b31fbbf8b78961fccaa9d0561661de (diff) | |
tdf#115602 keyboard navigation: Skip disabled toolbox items
Change-Id: I793dd301a04435c79a97819497b9d34fa49e298b
Reviewed-on: https://gerrit.libreoffice.org/49697
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'vcl/source')
| -rw-r--r-- | vcl/source/window/toolbox.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index e8031248714f..3bfbe0eff6b3 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -4882,7 +4882,8 @@ void ToolBox::ImplChangeHighlight( ImplToolItem const * pItem, bool bNoGrabFocus // check for keyboard accessible items static bool ImplIsValidItem( const ImplToolItem* pItem, bool bNotClipped ) { - bool bValid = (pItem && pItem->meType == ToolBoxItemType::BUTTON && pItem->mbVisible && !ImplIsFixedControl( pItem )); + bool bValid = (pItem && pItem->meType == ToolBoxItemType::BUTTON && pItem->mbVisible && !ImplIsFixedControl( pItem ) + && pItem->mbEnabled); if( bValid && bNotClipped && pItem->IsClipped() ) bValid = false; return bValid; |