Add circularNavigation property for selector (#136)

+
* Set focus to the selector when using the mouse wheel
* Set the selector to be topScrollable when hovering over it
only if enableScroll property is enabled

Core/selector.lua

@@ -405,20 +405,25 @@ end
 ---------------------OnMouseScrollAction------------------------
 ----------------------------------------------------------------
 dgsOnMouseScrollAction["dgs-dxselector"] = function(dgsEle,isWheelDown)
-	if dgsElementData[dgsEle].enableScroll and MouseData.focused == dgsEle then
+	if dgsElementData[dgsEle].enableScroll then
+		if MouseData.focused ~= dgsEle then 
+			dgsFocus(dgsEle)
+		end
 		local itemData = dgsElementData[dgsEle].itemData
 		local currentItem = dgsElementData[dgsEle].select
 		local isReversed = dgsElementData[dgsEle].isReversed
-		local itemIndex = mathClamp(currentItem+(isWheelDown and 1 or -1)*(isReversed and -1 or 1),1,#itemData)
-		dgsSelectorSetSelectedItem(dgsEle,itemIndex-itemIndex%1)
+		local itemCount = #itemData
+		local itemIndex = currentItem+(isWheelDown and 1 or -1)*(isReversed and -1 or 1)
+		itemIndex = dgsElementData[dgsEle].circularNavigation and (itemIndex < 1 and itemCount or itemIndex > itemCount and 1) or mathClamp(itemIndex-itemIndex%1,1,itemCount)
+		dgsSelectorSetSelectedItem(dgsEle,itemIndex)
 	end
 end
 
 ----------------------------------------------------------------
 --------------------------Renderer------------------------------
 ----------------------------------------------------------------
 dgsRenderer["dgs-dxselector"] = function(source,x,y,w,h,mx,my,cx,cy,enabledInherited,enabledSelf,eleData,parentAlpha,isPostGUI,rndtgt)
-	if MouseData.hit == source and MouseData.focused == source then
+	if MouseData.hit == source and eleData.enableScroll then
 		MouseData.topScrollable = source
 	end
 

client.lua

@@ -1485,7 +1485,8 @@ function onClientMouseTriggered(button)
 					else
 						dgsElementData[selector].quickLeapState = 0
 					end
-					dgsSelectorSetSelectedItem(selector,mathCeil(mathClamp(currentItem-offsetItem,1,itemCount)))
+					local itemIndex = dgsElementData[selector].circularNavigation and (currentItem-offsetItem-1)%itemCount+1 or mathClamp(currentItem-offsetItem,1,itemCount)
+					dgsSelectorSetSelectedItem(selector,itemIndex-itemIndex%1)
 				end
 			elseif MouseData.selectorEnterData == 3 then
 				local itemData = dgsElementData[selector].itemData
@@ -1499,7 +1500,8 @@ function onClientMouseTriggered(button)
 					else
 						dgsElementData[selector].quickLeapState = 0
 					end
-					dgsSelectorSetSelectedItem(selector,mathFloor(mathClamp(currentItem+offsetItem,1,itemCount)))
+					local itemIndex = dgsElementData[selector].circularNavigation and (currentItem+offsetItem-1)%itemCount+1 or mathClamp(currentItem+offsetItem,1,itemCount)
+					dgsSelectorSetSelectedItem(selector,itemIndex-itemIndex%1)
 				end
 			end
 		end