KOTOR: Implement highlightable buttons.

The difficult buttons now highlight on mouseover.
I also made the highlightable getter protected, as I don't
see any special cases where the gui needs to control it (for now).

src/engines/kotor/gui/widgets/button.cpp

@@ -54,6 +54,9 @@ void WidgetButton::load(const Aurora::GFFStruct &gff) {
 	if(getTextHighlightableComponent() != NULL) {
 		  setDefaultHighlighting(getTextHighlightableComponent());
 	}
+	if(getQuadHighlightableComponent() != NULL) {
+		  setDefaultHighlighting(getQuadHighlightableComponent());
+	}
 }
 
 void WidgetButton::mouseUp(uint8 state, float x, float y) {
@@ -73,6 +76,14 @@ void WidgetButton::enter() {
 		_text->setColor(r, g, b, a);
 		_text->setHighlighted(true);
 	}
+
+	if(getQuadHighlightableComponent() && getQuadHighlightableComponent()->isHighlightable()) {
+		_quad->getColor(_unselectedR, _unselectedG, _unselectedB, _unselectedA);
+		getQuadHighlightableComponent()->getHighlightedLowerBound(r, g, b, a);
+		_quad->setColor(r, g, b, a);
+		getQuadHighlightableComponent()->setHighlighted(true);
+	}
+
 }
 
 void WidgetButton::leave() {
@@ -81,6 +92,10 @@ void WidgetButton::leave() {
 		_text->setHighlighted(false);
 		_text->setColor(_unselectedR, _unselectedG, _unselectedB, _unselectedA);
 	}
+	if(getQuadHighlightableComponent() && getQuadHighlightableComponent()->isHighlightable()) {
+		getQuadHighlightableComponent()->setHighlighted(false);
+		_quad->setColor(_unselectedR, _unselectedG, _unselectedB, _unselectedA);
+	}
 }
 
 void WidgetButton::setDefaultHighlighting(Graphics::Aurora::Highlightable *highlightable) {

src/engines/kotor/gui/widgets/button.h

@@ -43,7 +43,7 @@ class WidgetButton : public KotORWidget {
 	WidgetButton(::Engines::GUI &gui, const Common::UString &tag);
 	~WidgetButton();
 
-	void load(const Aurora::GFFStruct &gff);
+	virtual void load(const Aurora::GFFStruct &gff);
 
 	void mouseUp(uint8 state, float x, float y);
 

src/engines/kotor/gui/widgets/kotorwidget.cpp

@@ -36,6 +36,7 @@
 #include "graphics/aurora/guiquad.h"
 #include "graphics/aurora/text.h"
 #include "graphics/aurora/highlightabletext.h"
+#include "graphics/aurora/highlightableguiquad.h"
 
 #include "engines/kotor/gui/widgets/kotorwidget.h"
 
@@ -164,7 +165,12 @@ void KotORWidget::load(const Aurora::GFFStruct &gff) {
 
 	Border border = createBorder(gff);
 
-	_quad = new Graphics::Aurora::GUIQuad(border.fill, 0.0, 0.0, extend.w, extend.h);
+	if(!border.fill.empty()) {
+		_quad = new Graphics::Aurora::HighlightableGUIQuad(border.fill, 0.0, 0.0, extend.w, extend.h);
+	} else {
+		_quad = new Graphics::Aurora::GUIQuad(border.fill, 0.0, 0.0, extend.w, extend.h);	  
+	}
+
 	_quad->setPosition(extend.x, extend.y, 0.0);
 	_quad->setTag(getTag());
 	_quad->setClickable(true);
@@ -286,6 +292,10 @@ Graphics::Aurora::Highlightable* KotORWidget::getTextHighlightableComponent() co
 	return static_cast<Graphics::Aurora::Highlightable*>(_text);
 }
 
+Graphics::Aurora::Highlightable* KotORWidget::getQuadHighlightableComponent() const {
+	return dynamic_cast<Graphics::Aurora::Highlightable*>(_quad);
+}
+
 } // End of namespace KotOR
 
 } // End of namespace Engines

src/engines/kotor/gui/widgets/kotorwidget.h

@@ -66,8 +66,6 @@ class KotORWidget : public Widget {
 	void setColor(float r, float g, float b, float a);
 	void setText(const Common::UString &text);
 
-	Graphics::Aurora::Highlightable *getTextHighlightableComponent() const;
-
 protected:
 	struct Extend {
 		float x;
@@ -108,6 +106,9 @@ class KotORWidget : public Widget {
 
 		Text();
 	};
+
+	Graphics::Aurora::Highlightable *getTextHighlightableComponent() const;
+	Graphics::Aurora::Highlightable *getQuadHighlightableComponent() const;
 
 	float _width;
 	float _height;