From 80d34a8a7cc6960006bc90f80686c2241f60226f Mon Sep 17 00:00:00 2001
From: Zerophase
Date: Mon, 31 Mar 2014 00:43:54 -0500
Subject: GUI: Add Tab cycling to  TabWidget

Tab and Shift-Tab can now cycle between each Tab of the Edit Game menu.
---
 gui/widgets/tab.cpp | 27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

(limited to 'gui/widgets/tab.cpp')

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();
 
-- 
cgit v1.2.3


From 5df3c14eba68e299d270e773194608808adaa1ae Mon Sep 17 00:00:00 2001
From: Zerophase
Date: Tue, 1 Apr 2014 05:42:16 -0500
Subject: GUI: Fix tab cycling when total tabs increase.

Tab cycling ignores tab width, and slides correctly for larger tab counts.
---
 gui/widgets/tab.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'gui/widgets/tab.cpp')

diff --git a/gui/widgets/tab.cpp b/gui/widgets/tab.cpp
index 87c6b652d3..3ba6be8166 100644
--- a/gui/widgets/tab.cpp
+++ b/gui/widgets/tab.cpp
@@ -227,9 +227,9 @@ void TabWidget::handleMouseDown(int x, int y, int button, int clickCount) {
 
 bool TabWidget::handleKeyDown(Common::KeyState state) {
 	if (state.hasFlags(Common::KBD_SHIFT) && state.keycode == Common::KEYCODE_TAB)
-		adjustTabs(-1);
+		adjustTabs(-kAheadTab);
 	else if (state.keycode == Common::KEYCODE_TAB)
-		adjustTabs(1);
+		adjustTabs(kAheadTab);
 
 	return Widget::handleKeyDown(state);
 }
@@ -242,15 +242,15 @@ void TabWidget::adjustTabs(int value) {
 	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()))
+	// slides _firstVisibleTab forward to the correct tab
+	while (_firstVisibleTab < tabID - kMaxTabs)
 		_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);
+	// slide _firstVisibleTab backwards to the correct tab
+	while (tabID < _firstVisibleTab)
+			_firstVisibleTab--;
+
+	setActiveTab(tabID);
 }
 
 void TabWidget::reflowLayout() {
-- 
cgit v1.2.3


From 5c12e09ed1e2c2b83d74d824a941220b8faa11c9 Mon Sep 17 00:00:00 2001
From: Zerophase
Date: Sun, 6 Apr 2014 19:56:55 -0500
Subject: GUI: Tab cycling handles multiple themes.

First visible tab moves up when a theme's width cannot fit another tab.
---
 gui/widgets/tab.cpp | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'gui/widgets/tab.cpp')

diff --git a/gui/widgets/tab.cpp b/gui/widgets/tab.cpp
index 3ba6be8166..756781a04b 100644
--- a/gui/widgets/tab.cpp
+++ b/gui/widgets/tab.cpp
@@ -183,6 +183,7 @@ void TabWidget::setActiveTab(int tabID) {
 		}
 		_activeTab = tabID;
 		_firstWidget = _tabs[tabID].firstWidget;
+
 		_boss->draw();
 	}
 }
@@ -227,28 +228,29 @@ void TabWidget::handleMouseDown(int x, int y, int button, int clickCount) {
 
 bool TabWidget::handleKeyDown(Common::KeyState state) {
 	if (state.hasFlags(Common::KBD_SHIFT) && state.keycode == Common::KEYCODE_TAB)
-		adjustTabs(-kAheadTab);
+		adjustTabs(kTabBackwards);
 	else if (state.keycode == Common::KEYCODE_TAB)
-		adjustTabs(kAheadTab);
+		adjustTabs(kTabForwards);
 
 	return Widget::handleKeyDown(state);
 }
 
 void TabWidget::adjustTabs(int value) {
-	// determine which tab is next
+	// 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);
 
-	// slides _firstVisibleTab forward to the correct tab
-	while (_firstVisibleTab < tabID - kMaxTabs)
+	// Slides _firstVisibleTab forward to the correct tab
+	int maxTabsOnScreen = (_w / _tabWidth);
+	if (tabID >= maxTabsOnScreen && (_firstVisibleTab + maxTabsOnScreen) < (int)_tabs.size())
 		_firstVisibleTab++;
 
-	// slide _firstVisibleTab backwards to the correct tab
+	// Slides _firstVisibleTab backwards to the correct tab
 	while (tabID < _firstVisibleTab)
-			_firstVisibleTab--;
+		_firstVisibleTab--;
 
 	setActiveTab(tabID);
 }
-- 
cgit v1.2.3