From: terencehill <piuntn@gmail.com>
Date: Sat, 25 Jul 2015 13:53:10 +0000 (+0200)
Subject: Reimplement the campaign list fix (commit 58709f8868) in the listbox class so it... 
X-Git-Tag: xonotic-v0.8.1~11^2~11
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=034190717feab9203335e34fb4ae04daa7857296;p=xonotic%2Fxonotic-data.pk3dir.git

Reimplement the campaign list fix (commit 58709f8868) in the listbox class so it fixes a weird behaviour in the language list too
---

diff --git a/qcsrc/menu/item/listbox.qc b/qcsrc/menu/item/listbox.qc
index 48af5e501..ad80d18ad 100644
--- a/qcsrc/menu/item/listbox.qc
+++ b/qcsrc/menu/item/listbox.qc
@@ -21,6 +21,8 @@ CLASS(ListBox, Item)
 	ATTRIB(ListBox, origin, vector, '0 0 0')
 	ATTRIB(ListBox, scrollPos, float, 0) // measured in window heights, fixed when needed
 	ATTRIB(ListBox, scrollPosTarget, float, 0)
+	ATTRIB(ListBox, needScrollToItem, float, -1)
+	METHOD(ListBox, scrollToItem, void(entity, int))
 	ATTRIB(ListBox, previousValue, float, 0)
 	ATTRIB(ListBox, pressed, float, 0) // 0 = normal, 1 = scrollbar dragging, 2 = item dragging, 3 = released
 	ATTRIB(ListBox, pressOffset, float, 0)
@@ -81,8 +83,16 @@ ENDCLASS(ListBox)
 #endif
 
 #ifdef IMPLEMENTATION
-void ListBox_setSelected(entity me, float i)
+void ListBox_scrollToItem(entity me, int i)
 {
+	// scroll doesn't work properly until iHeight is set to the correct value
+	// at the first resizeNotify call
+	if(me.iHeight == 1) // initial temporary value of iHeight is 1
+	{
+		me.needScrollToItem = i;
+		return;
+	}
+
 	i = bound(0, i, me.nItems - 1);
 
 	// scroll the list to make sure the selected item is visible
@@ -98,10 +108,14 @@ void ListBox_setSelected(entity me, float i)
 		if(i == me.nItems - 1)
 			me.scrollPosTarget = me.getTotalHeight(me) - 1;
 		else
-		{
 			me.scrollPosTarget = me.getItemStart(me, i + 1) - 1;
-		}
 	}
+}
+
+void ListBox_setSelected(entity me, float i)
+{
+	i = bound(0, i, me.nItems - 1);
+	me.scrollToItem(me, i);
 	me.selectedItem = i;
 }
 void ListBox_resizeNotify(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize)
@@ -356,7 +370,11 @@ void ListBox_draw(entity me)
 	float i;
 	vector absSize, fillSize = '0 0 0';
 	vector oldshift, oldscale;
-
+	if(me.needScrollToItem >= 0)
+	{
+		me.scrollToItem(me, me.needScrollToItem);
+		me.needScrollToItem = -1;
+	}
 	if(me.scrollPos != me.scrollPosTarget)
 	{
 		float PI = 3.1415926535897932384626433832795028841971693993751058209749445923;
diff --git a/qcsrc/menu/xonotic/campaign.qc b/qcsrc/menu/xonotic/campaign.qc
index 76d90285b..238773516 100644
--- a/qcsrc/menu/xonotic/campaign.qc
+++ b/qcsrc/menu/xonotic/campaign.qc
@@ -130,11 +130,8 @@ void XonoticCampaignList_loadCvars(entity me)
 		rewrapCampaign(me.columnNameSize, me.rowsPerItem - 3, me.emptyLineHeight, me.realFontSize);
 	me.nItems = min(me.campaignIndex + 2, campaign_entries);
 	me.setSelected(me, min(me.campaignIndex, me.nItems - 1));
-	// itemHeight will be initialized to the correct value at the first resizeNotify call
-	if(me.itemHeight == 1) // initial temporary value of itemHeight is 1
-		me.scrollPosTarget = 9999;
-	else
-		me.scrollPosTarget = me.nItems * me.itemHeight - 1;
+	if(me.nItems - 1 > me.campaignIndex)
+		me.scrollToItem(me, me.nItems - 1);
 	if(me.labelTitle)
 		me.labelTitle.setText(me.labelTitle, campaign_title);
 }