From 0b7e752bd177c90a05ca752fa31810f9e34c432c Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 19 Apr 2012 23:48:29 +0300 Subject: Dehardcode keys in gui widgets. Add new tab with keys settings in input settings tab. --- src/gui/widgets/tabbedarea.cpp | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) (limited to 'src/gui/widgets/tabbedarea.cpp') diff --git a/src/gui/widgets/tabbedarea.cpp b/src/gui/widgets/tabbedarea.cpp index bb8ea063b..b24ae32e5 100644 --- a/src/gui/widgets/tabbedarea.cpp +++ b/src/gui/widgets/tabbedarea.cpp @@ -22,6 +22,9 @@ #include "gui/widgets/tabbedarea.h" +#include "keydata.h" +#include "keyevent.h" + #include "gui/widgets/scrollarea.h" #include "gui/widgets/tab.h" @@ -482,7 +485,9 @@ void TabbedArea::keyPressed(gcn::KeyEvent& keyEvent) if (keyEvent.isConsumed() || !isFocused()) return; - if (keyEvent.getKey().getValue() == gcn::Key::LEFT) + int actionId = static_cast(&keyEvent)->getActionId(); + + if (actionId == Input::KEY_GUI_LEFT) { int index = getSelectedTabIndex(); index--; @@ -494,7 +499,7 @@ void TabbedArea::keyPressed(gcn::KeyEvent& keyEvent) keyEvent.consume(); } - else if (keyEvent.getKey().getValue() == gcn::Key::RIGHT) + else if (actionId == Input::KEY_GUI_RIGHT) { int index = getSelectedTabIndex(); index++; @@ -507,13 +512,3 @@ void TabbedArea::keyPressed(gcn::KeyEvent& keyEvent) keyEvent.consume(); } } - -/* -void TabbedArea::moveLeft(gcn::Tab *tab) -{ -} - -void TabbedArea::moveRight(gcn::Tab *tab) -{ -} -*/ -- cgit v1.2.3-60-g2f50