KOTOR: All text button widgets now highlight on mouseover.

This seems to be the behavior in the original game, and simplifies the code.
xoreos · Aug 7, 2013 · a6f4485 · a6f4485
1 parent f46ed0a
commit a6f4485
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 40 deletions.
diff --git a/src/engines/kotor/gui/gui.cpp b/src/engines/kotor/gui/gui.cpp
@@ -271,13 +271,6 @@ void GUI::addBackground(const Common::UString &background) {
 	addWidget(backPanel);
 }
 
-void GUI::setDefaultHighlighting(Graphics::Aurora::Highlightable *highlightable) {
-	highlightable->setHighlightable(true);
-	highlightable->setHighlightDelta(0, 0, 0, .05);
-	highlightable->setHighlightLowerBound(1, 1, 0, .2);
-	highlightable->setHighlightUpperBound(1, 1, 0, 1);
-}
-
 } // End of namespace KotOR
 
 } // End of namespace Engines
diff --git a/src/engines/kotor/gui/gui.h b/src/engines/kotor/gui/gui.h
@@ -89,8 +89,6 @@ class GUI : public Engines::GUI {
 
 	void addBackground(const Common::UString &background);
 
-	void setDefaultHighlighting(Graphics::Aurora::Highlightable *highlightable);
-
 private:
 	struct WidgetContext {
 		const Aurora::GFFStruct *strct;

diff --git a/src/engines/kotor/gui/main/main.cpp b/src/engines/kotor/gui/main/main.cpp
@@ -49,7 +49,6 @@ MainMenu::MainMenu(Module &module, bool isXbox) : _module(&module), _isXbox(isXb
 	load(isXbox ? "mainmenu" : "mainmenu16x12");
 
 	addBackground("back");
-	configureHighlighting();
 
 	_movies = 0;
 	_options = 0;
@@ -76,14 +75,6 @@ void MainMenu::createOptions() {
 
 }
 
-void MainMenu::configureHighlighting() {
-	setDefaultHighlighting(getButton("BTN_NEWGAME")->getTextHighlightableComponent());
-	setDefaultHighlighting(getButton("BTN_LOADGAME")->getTextHighlightableComponent());
-	setDefaultHighlighting(getButton("BTN_MOVIES")->getTextHighlightableComponent());
-	setDefaultHighlighting(getButton("BTN_OPTIONS")->getTextHighlightableComponent());
-	setDefaultHighlighting(getButton("BTN_EXIT")->getTextHighlightableComponent());
-}
-
 void MainMenu::initWidget(Widget &widget) {
 	// BioWare logo, the original game doesn't display it.
 	if (widget.getTag() == "LBL_BW") {

diff --git a/src/engines/kotor/gui/main/main.h b/src/engines/kotor/gui/main/main.h
@@ -57,7 +57,6 @@ class MainMenu : public GUI {
 
 	void createMovies();
 	void createOptions();
-	void configureHighlighting();
 };
 
 } // End of namespace KotOR

diff --git a/src/engines/kotor/gui/main/options.cpp b/src/engines/kotor/gui/main/options.cpp
@@ -52,8 +52,6 @@ OptionsMenu::OptionsMenu() {
 	_graphics = new OptionsGraphicsMenu();
 	_sound = new OptionsSoundMenu();
 
-	configureText();
-
 }
 
 OptionsMenu::~OptionsMenu() {
@@ -64,22 +62,6 @@ OptionsMenu::~OptionsMenu() {
 	delete _sound;
 }
 
-void OptionsMenu::configureText() {
-	setDefaultHighlighting(getButton("BTN_GAMEPLAY")->getTextHighlightableComponent());
-	setDefaultHighlighting(getButton("BTN_FEEDBACK")->getTextHighlightableComponent());
-	setDefaultHighlighting(getButton("BTN_AUTOPAUSE")->getTextHighlightableComponent());
-	setDefaultHighlighting(getButton("BTN_GRAPHICS")->getTextHighlightableComponent());
-	setDefaultHighlighting(getButton("BTN_SOUND")->getTextHighlightableComponent());
-	setDefaultHighlighting(getButton("BTN_BACK")->getTextHighlightableComponent());
-}
-
-void OptionsMenu::setDefaultHighlighting(Graphics::Aurora::Highlightable* highlightable) {
-	highlightable->setHighlightable(true);
-	highlightable->setHighlightDelta(0, 0, 0, .05);
-	highlightable->setHighlightLowerBound(1, 1, 0, .2);
-	highlightable->setHighlightUpperBound(1, 1, 0, 1);
-}
-
 void OptionsMenu::callbackActive(Widget &widget) {
 	if (widget.getTag() == "BTN_GAMEPLAY") {
 		sub(*_gameplay);

diff --git a/src/engines/kotor/gui/main/options.h b/src/engines/kotor/gui/main/options.h
@@ -51,9 +51,6 @@ class OptionsMenu : public GUI {
 private:
 	void adoptChanges();
 
-	void configureText();
-	void setDefaultHighlighting(Graphics::Aurora::Highlightable* highlightable);
-
 	GUI *_gameplay;
 	GUI *_feedback;
 	GUI *_autopause;

diff --git a/src/engines/kotor/gui/widgets/button.cpp b/src/engines/kotor/gui/widgets/button.cpp
@@ -51,6 +51,9 @@ WidgetButton::~WidgetButton() {
 
 void WidgetButton::load(const Aurora::GFFStruct &gff) {
 	KotORWidget::load(gff);
+	if(getTextHighlightableComponent() != NULL) {
+		  setDefaultHighlighting(getTextHighlightableComponent());
+	}
 }
 
 void WidgetButton::mouseUp(uint8 state, float x, float y) {
@@ -80,6 +83,13 @@ void WidgetButton::leave() {
 	}
 }
 
+void WidgetButton::setDefaultHighlighting(Graphics::Aurora::Highlightable *highlightable) {
+	highlightable->setHighlightable(true);
+	highlightable->setHighlightDelta(0, 0, 0, .05);
+	highlightable->setHighlightLowerBound(1, 1, 0, .2);
+	highlightable->setHighlightUpperBound(1, 1, 0, 1);
+}
+
 } // End of namespace KotOR
 
 } // End of namespace Engines
diff --git a/src/engines/kotor/gui/widgets/button.h b/src/engines/kotor/gui/widgets/button.h
@@ -52,6 +52,8 @@ class WidgetButton : public KotORWidget {
 	virtual void leave();
 
 private:
+
+	void setDefaultHighlighting(Graphics::Aurora::Highlightable *highlightable);
 	Sound::ChannelHandle _sound;
 	float _unselectedR, _unselectedG, _unselectedB, _unselectedA;
 };