ENGINES: Enable scrolling in list boxes

xoreos · Jul 22, 2018 · f84342a · f84342a
1 parent 4953a21
commit f84342a
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 4 deletions.
diff --git a/src/engines/aurora/kotorjadegui/listbox.cpp b/src/engines/aurora/kotorjadegui/listbox.cpp
@@ -142,7 +142,7 @@ void WidgetListBox::createItemWidgets(uint32 count) {
 				break;
 			case kLBItemTypeDefault:
 			default:
-				item = new WidgetProtoItem(*_gui, tag);
+				item = new WidgetProtoItem(*_gui, tag, this);
 				break;
 		}
 
@@ -382,4 +382,15 @@ void WidgetListBox::applyChangesToItemWidgets() {
 	}
 }
 
+void WidgetListBox::mouseWheel(uint8 state, int x, int y) {
+	if (y == 0 || !_adjustHeight)
+		return;
+
+	_startIndex = MIN(
+		MAX(_startIndex - y, 0),
+		MIN(static_cast<int>(_itemWidgets.size()) - _numVisibleItems, 0)
+	);
+	refreshItemWidgets();
+}
+
 } // End of namespace Engines
diff --git a/src/engines/aurora/kotorjadegui/listbox.h b/src/engines/aurora/kotorjadegui/listbox.h
@@ -95,6 +95,8 @@ class WidgetListBox : public KotORJadeWidget {
 
 	void subActive(Widget &widget);
 
+	void mouseWheel(uint8 state, int x, int y);
+
 	void setSoundSelectItem(const Common::UString &resRef);
 	void setSoundHoverItem(const Common::UString &resRef);
 	void setSoundClickItem(const Common::UString &resRef);

diff --git a/src/engines/aurora/kotorjadegui/protoitem.cpp b/src/engines/aurora/kotorjadegui/protoitem.cpp
@@ -31,10 +31,11 @@
 
 namespace Engines {
 
-WidgetProtoItem::WidgetProtoItem(GUI &gui, const Common::UString &tag)
+WidgetProtoItem::WidgetProtoItem(GUI &gui, const Common::UString &tag, WidgetListBox *parentList)
 		: KotORJadeWidget(gui, tag),
 		  _disableHighlight(false),
-		  _hovered(false) {
+		  _hovered(false),
+		  _parentList(parentList) {
 }
 
 WidgetProtoItem::~WidgetProtoItem() {
@@ -104,4 +105,9 @@ void WidgetProtoItem::setDefaultHighlighting(Graphics::Aurora::Highlightable *hi
 	highlightable->setHighlightUpperBound(1.0f, 1.0f, 0.0f, 1.0f);
 }
 
+void WidgetProtoItem::mouseWheel(uint8 state, int x, int y) {
+	if (_parentList)
+		_parentList->mouseWheel(state, x, y);
+}
+
 } // End of namespace Engines
diff --git a/src/engines/aurora/kotorjadegui/protoitem.h b/src/engines/aurora/kotorjadegui/protoitem.h
@@ -26,12 +26,13 @@
 #define ENGINES_AURORA_KOTORJADEGUI_PROTOITEM_H
 
 #include "src/engines/aurora/kotorjadegui/kotorjadewidget.h"
+#include "src/engines/aurora/kotorjadegui/listbox.h"
 
 namespace Engines {
 
 class WidgetProtoItem : public KotORJadeWidget {
 public:
-	WidgetProtoItem(GUI &gui, const Common::UString &tag);
+	WidgetProtoItem(GUI &gui, const Common::UString &tag, WidgetListBox *parentList = 0);
 	~WidgetProtoItem();
 
 	/** Set item contents. If not overriden this method will only
@@ -48,6 +49,8 @@ class WidgetProtoItem : public KotORJadeWidget {
 
 	void mouseUp(uint8 state, float x, float y);
 
+	virtual void mouseWheel(uint8 state, int x, int y);
+
 	void setDisableHighlight(bool disableHighlight);
 
 	void setSoundHover(const Common::UString &resRef);
@@ -57,6 +60,8 @@ class WidgetProtoItem : public KotORJadeWidget {
 	bool _disableHighlight;
 	bool _hovered;
 
+	WidgetListBox *_parentList;
+
 	Common::UString _soundHover;
 	Common::UString _soundClick;