X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Fweaponslist.c;h=e64cc72d087f99aaa1315f304eeab312320c3ca8;hb=35a27cda61401d3d1af6782ee9c4661c7280f7ad;hp=aa47110bee63eeec644582a2b99e8b356d955d15;hpb=2cae82e1c3d4a860a6e649c0e89a2a9eb2ff5d80;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/xonotic/weaponslist.c b/qcsrc/menu/xonotic/weaponslist.c
index aa47110be..e64cc72d0 100644
--- a/qcsrc/menu/xonotic/weaponslist.c
+++ b/qcsrc/menu/xonotic/weaponslist.c
@@ -10,7 +10,6 @@ CLASS(XonoticWeaponsList) EXTENDS(XonoticListBox)
 	ATTRIB(XonoticWeaponsList, realFontSize, vector, '0 0 0')
 	ATTRIB(XonoticWeaponsList, realUpperMargin, float, 0)
 	METHOD(XonoticWeaponsList, mouseDrag, float(entity, vector))
-	ATTRIB(XonoticWeaponsList, scrollbarWidth, float, 0)
 ENDCLASS(XonoticWeaponsList)
 entity makeXonoticWeaponsList();
 void WeaponsList_MoveUp_Click(entity btn, entity me);
@@ -66,11 +65,22 @@ void XonoticWeaponsList_resizeNotify(entity me, vector relOrigin, vector relSize
 }
 float XonoticWeaponsList_mouseDrag(entity me, vector pos)
 {
-	float f, i;
+	float f, i, scrollbar;
 	i = me.selectedItem;
 	f = SUPER(XonoticWeaponsList).mouseDrag(me, pos);
-	if(me.selectedItem != i)
-		cvar_set("cl_weaponpriority", swapInPriorityList(cvar_string("cl_weaponpriority"), me.selectedItem, i));
+	
+	scrollbar = 1;
+	if(pos_x < 1 - me.controlWidth - me.tolerance_y * me.controlWidth) scrollbar = 0;
+	if(pos_y < 0 - me.tolerance_x) scrollbar = 0;
+	if(pos_x >= 1 + me.tolerance_y * me.controlWidth) scrollbar = 0;
+	if(pos_y >= 1 + me.tolerance_x) scrollbar = 0;
+	
+	if not(scrollbar) // don't change priority if the person is just scrolling
+	{
+		if(me.selectedItem != i)
+			cvar_set("cl_weaponpriority", swapInPriorityList(cvar_string("cl_weaponpriority"), me.selectedItem, i));
+	}
+	
 	return f;
 }
 string XonoticWeaponsList_toString(entity me)