diff options
| -rw-r--r-- | gui/dialog.cpp | 13 | ||||
| -rw-r--r-- | gui/widgets/tab.cpp | 27 | ||||
| -rw-r--r-- | gui/widgets/tab.h | 2 |
3 files changed, 38 insertions, 4 deletions
diff --git a/gui/dialog.cpp b/gui/dialog.cpp index ec392a877a..fa4e508494 100644 --- a/gui/dialog.cpp +++ b/gui/dialog.cpp @@ -250,7 +250,18 @@ void Dialog::handleKeyDown(Common::KeyState state) { close(); } - // TODO: tab/shift-tab should focus the next/previous focusable widget + if (state.keycode == Common::KEYCODE_TAB) { + // TODO: Maybe add Tab behaviours for all widgets too. + // searches through widgets on screen for tab widget + Widget *w = _firstWidget; + while (w) { + if (w->_type == kTabWidget) + if (w->handleKeyDown(state)) + return; + + w = w->_next; + } + } } void Dialog::handleKeyUp(Common::KeyState state) { diff --git a/gui/widgets/tab.cpp b/gui/widgets/tab.cpp index a8b3f5450d..87c6b652d3 100644 --- a/gui/widgets/tab.cpp +++ b/gui/widgets/tab.cpp @@ -226,12 +226,33 @@ void TabWidget::handleMouseDown(int x, int y, int button, int clickCount) { } bool TabWidget::handleKeyDown(Common::KeyState state) { - // TODO: maybe there should be a way to switch between tabs - // using the keyboard? E.g. Alt-Shift-Left/Right-Arrow or something - // like that. + if (state.hasFlags(Common::KBD_SHIFT) && state.keycode == Common::KEYCODE_TAB) + adjustTabs(-1); + else if (state.keycode == Common::KEYCODE_TAB) + adjustTabs(1); + return Widget::handleKeyDown(state); } +void TabWidget::adjustTabs(int value) { + // determine which tab is next + int tabID = _activeTab + value; + if (tabID >= (int)_tabs.size()) + tabID = 0; + else if (tabID < 0) + tabID = ((int)_tabs.size() - 1); + + // If tabbing moves the last tab out of sight slide tabs over + if ((tabID * _tabWidth) > (_w - getAbsX())) + _firstVisibleTab++; + else if (tabID == 0) + _firstVisibleTab = tabID; + + // If a tab was clicked, switch to that pane + if (tabID >= 0 && tabID < (int)_tabs.size()) + setActiveTab(tabID); +} + void TabWidget::reflowLayout() { Widget::reflowLayout(); diff --git a/gui/widgets/tab.h b/gui/widgets/tab.h index 38aa089eb5..08f29f9929 100644 --- a/gui/widgets/tab.h +++ b/gui/widgets/tab.h @@ -109,6 +109,8 @@ protected: virtual void drawWidget(); virtual Widget *findWidget(int x, int y); + + virtual void adjustTabs(int value); }; } // End of namespace GUI |