[BUGFIX][Region]: Fixed issue where user input is locked up when usin…

…g the mouse wheel.
flamendless · Sep 4, 2019 · e4d8ee3 · e4d8ee3
1 parent bdc4653
commit e4d8ee3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/API.lua b/API.lua
@@ -198,7 +198,7 @@ local Slab = {}
 -- Slab version numbers.
 local Version_Major = 0
 local Version_Minor = 6
-local Version_Revision = 0
+local Version_Revision = 1
 
 local FrameNumber = 0
 local FrameStatHandle = nil

diff --git a/Internal/UI/Region.lua b/Internal/UI/Region.lua
@@ -338,7 +338,10 @@ function Region.End()
 	DrawCommands.TransformPop()
 	DrawScrollBars(ActiveInstance)
 
-	if HotInstance == ActiveInstance and WheelInstance == nil and (WheelX ~= 0.0 or WheelY ~= 0.0) then
+	if HotInstance == ActiveInstance
+		and WheelInstance == nil 
+		and (WheelX ~= 0.0 or WheelY ~= 0.0)
+		and not ActiveInstance.IgnoreScroll then
 		WheelInstance = ActiveInstance
 	end