KOTOR: Load listbox widget scrollbar, offset items by its size

xoreos · May 11, 2018 · 1107ecf · 1107ecf
1 parent c7a3204
commit 1107ecf
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/src/engines/kotor/gui/widgets/listbox.cpp b/src/engines/kotor/gui/widgets/listbox.cpp
@@ -33,8 +33,9 @@ namespace Engines {
 
 namespace KotOR {
 
-WidgetListBox::WidgetListBox(::Engines::GUI &gui, const Common::UString &tag) :
-	KotORWidget(gui, tag), _protoItem(0), _itemCount(0), _padding(0) {
+WidgetListBox::WidgetListBox(::Engines::GUI &gui, const Common::UString &tag)
+		: KotORWidget(gui, tag), _protoItem(0), _scrollBar(0), _itemCount(0),
+		  _padding(0), _leftScrollBar(false) {
 }
 
 WidgetListBox::~WidgetListBox() {
@@ -47,8 +48,12 @@ void WidgetListBox::load(const Aurora::GFF3Struct &gff) {
 		_protoItem = &gff.getStruct("PROTOITEM");
 	}
 
-	if (gff.hasField("SCROLLBAR")) {
+	if (gff.hasField("LEFTSCROLLBAR")) {
+		_leftScrollBar = gff.getBool("LEFTSCROLLBAR");
+	}
 
+	if (gff.hasField("SCROLLBAR")) {
+		_scrollBar = &gff.getStruct("SCROLLBAR");
 	}
 
 	if (gff.hasField("PADDING")) {
@@ -81,6 +86,10 @@ KotORWidget *WidgetListBox::createItem(Common::UString name) {
 	float x, y, z;
 	getPosition(x, y, z);
 
+	if (_scrollBar && _leftScrollBar)
+		x += _scrollBar->getStruct("BORDER").getSint("DIMENSION") +
+		     _scrollBar->getStruct("EXTENT").getSint("WIDTH");
+
 	assert(getHeight() > 0);
 
 	y = y - _itemCount * (item->getHeight() + _padding) + getHeight() - item->getHeight();

diff --git a/src/engines/kotor/gui/widgets/listbox.h b/src/engines/kotor/gui/widgets/listbox.h
@@ -42,9 +42,11 @@ class WidgetListBox : public KotORWidget {
 
 private:
 	const Aurora::GFF3Struct *_protoItem;
+	const Aurora::GFF3Struct *_scrollBar;
 
 	int _itemCount;
 	int _padding;
+	bool _leftScrollBar;
 };
 
 } // End of namespace KotOR