KOTOR: Fix for button text disappearing in character menu

xoreos · Jul 1, 2017 · a58cda1 · a58cda1
1 parent b52966e
commit a58cda1
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/src/engines/kotor/gui/widgets/button.cpp b/src/engines/kotor/gui/widgets/button.cpp
@@ -41,7 +41,7 @@ namespace KotOR {
 
 WidgetButton::WidgetButton(::Engines::GUI &gui, const Common::UString &tag) :
 	KotORWidget(gui, tag), _permanentHighlight(false), _disableHighlight(false),
-	_disableHoverSound(false),  _hovered(false) {
+	_disableHoverSound(false),  _hovered(false), _highlighted(false) {
 }
 
 WidgetButton::~WidgetButton() {
@@ -51,17 +51,23 @@ void WidgetButton::setPermanentHighlight(bool permanentHighlight) {
 	_permanentHighlight = permanentHighlight;
 
 	if (_permanentHighlight) {
-		startHighlight();
+		if (!_highlighted)
+			startHighlight();
 	} else {
-		stopHighlight();
+		if (_highlighted)
+			stopHighlight();
 	}
 }
 
 void WidgetButton::setDisableHighlight(bool disableHighlight) {
 	_disableHighlight = disableHighlight;
 
 	if (_disableHighlight) {
-		stopHighlight();
+		if (_highlighted)
+			stopHighlight();
+	} else {
+		if (_hovered)
+			startHighlight();
 	}
 }
 
@@ -131,6 +137,8 @@ void WidgetButton::startHighlight() {
 		_quad->setColor(r, g, b, a);
 		getQuadHighlightableComponent()->setHighlighted(true);
 	}
+
+	_highlighted = true;
 }
 
 void WidgetButton::stopHighlight() {
@@ -142,6 +150,8 @@ void WidgetButton::stopHighlight() {
 		getQuadHighlightableComponent()->setHighlighted(false);
 		_quad->setColor(_unselectedR, _unselectedG, _unselectedB, _unselectedA);
 	}
+
+	_highlighted = false;
 }
 
 void WidgetButton::setDefaultHighlighting(Graphics::Aurora::Highlightable *highlightable) {

diff --git a/src/engines/kotor/gui/widgets/button.h b/src/engines/kotor/gui/widgets/button.h
@@ -61,6 +61,7 @@ class WidgetButton : public KotORWidget {
 	float _unselectedR, _unselectedG, _unselectedB, _unselectedA;
 
 	bool _hovered;
+	bool _highlighted;
 
 	void setDefaultHighlighting(Graphics::Aurora::Highlightable *highlightable);