From 746e44bf2b25cd7c9e021c537c2424e5ef73cb1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mart=C3=ADn=20Lucas=20Golini?= Date: Fri, 11 Mar 2022 17:58:57 -0300 Subject: [PATCH] Minor fix in UITableView and UITreeView keyboard navigation. --- include/eepp/window/keycodes.hpp | 1 + src/eepp/ui/uitableview.cpp | 2 +- src/eepp/ui/uitreeview.cpp | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/eepp/window/keycodes.hpp b/include/eepp/window/keycodes.hpp index f0896fcc1..5a271816e 100644 --- a/include/eepp/window/keycodes.hpp +++ b/include/eepp/window/keycodes.hpp @@ -683,6 +683,7 @@ enum KeyModTable { #define KEYMOD_SHIFT ( KEYMOD_LSHIFT | KEYMOD_RSHIFT ) #define KEYMOD_ALT ( KEYMOD_LALT | KEYMOD_RALT ) #define KEYMOD_META ( KEYMOD_LMETA | KEYMOD_RMETA ) +#define KEYMOD_CTRL_SHIFT_ALT_META ( KEYMOD_CTRL | KEYMOD_SHIFT | KEYMOD_ALT | KEYMOD_META ) /** @enum MouseButton Mouse buttons */ enum MouseButton { diff --git a/src/eepp/ui/uitableview.cpp b/src/eepp/ui/uitableview.cpp index b5ffdeb6d..27eb15893 100644 --- a/src/eepp/ui/uitableview.cpp +++ b/src/eepp/ui/uitableview.cpp @@ -172,7 +172,7 @@ void UITableView::onColumnSizeChange( const size_t& colIndex, bool fromUserInter } Uint32 UITableView::onKeyDown( const KeyEvent& event ) { - if ( event.getMod() ) + if ( event.getMod() & KEYMOD_CTRL_SHIFT_ALT_META ) return UIAbstractTableView::onKeyDown( event ); auto curIndex = getSelection().first(); int pageSize = eefloor( getVisibleArea().getHeight() / getRowHeight() ) - 1; diff --git a/src/eepp/ui/uitreeview.cpp b/src/eepp/ui/uitreeview.cpp index ca29d9e2f..25fb82281 100644 --- a/src/eepp/ui/uitreeview.cpp +++ b/src/eepp/ui/uitreeview.cpp @@ -453,7 +453,7 @@ void UITreeView::setExpanderIconSize( const size_t& expanderSize ) { } Uint32 UITreeView::onKeyDown( const KeyEvent& event ) { - if ( event.getMod() ) + if ( event.getMod() & KEYMOD_CTRL_SHIFT_ALT_META ) return UIAbstractTableView::onKeyDown( event ); auto curIndex = getSelection().first();