Added wheelmoved() event method (which can do horizontal scrolling).

Added get/setWheelScrollSpeed*().
Second argument for setMouseScrollSpeed() is now optional.

Author: ReFreezed

InputField.lua

@@ -24,14 +24,16 @@
 	getDoubleClickMaxDelay, setDoubleClickMaxDelay
 	getFilter, setFilter
 	getFont, setFont
+	getMaxHistory, setMaxHistory
 	getMouseScrollSpeed, getMouseScrollSpeedX, getMouseScrollSpeedY, setMouseScrollSpeed, setMouseScrollSpeedX, setMouseScrollSpeedY
 	getType, setType, isPassword, isMultiline
+	getWheelScrollSpeed, getWheelScrollSpeedX, getWheelScrollSpeedY, setWheelScrollSpeed, setWheelScrollSpeedX, setWheelScrollSpeedY
 	isEditable, setEditable
 	isFontFilteringActive, setFontFilteringActive
 
 	-- Events:
 	update
-	mousepressed, mousemoved, mousereleased
+	mousepressed, mousemoved, mousereleased, wheelmoved
 	keypressed, textinput
 
 	-- Other:
@@ -42,7 +44,6 @@
 	getCursor, setCursor, moveCursor, getCursorSelectionSide, getAnchorSelectionSide
 	getCursorLayout
 	getInfoAtCoords
-	getMaxHistory, setMaxHistory
 	getScroll, getScrollX, getScrollY, setScroll, setScrollX, setScrollY, scroll, scrollToCursor
 	getScrollHandles, getScrollHandleHorizontal, getScrollHandleVertical
 	getScrollLimits
@@ -108,6 +109,9 @@
 	function love.mousereleased(mx, my, mbutton)
 		field:mousereleased(mx-fieldX, my-fieldY, mbutton)
 	end
+	function love.wheelmoved(dx, dy)
+		field:wheelmoved(dx, dy)
+	end
 
 	function love.draw()
 		love.graphics.setColor(0, 0, 1)
@@ -747,6 +751,9 @@ local function newInputField(text, fieldType)
 		mouseScrollSpeedX = 6.0, -- Per pixel per second.
 		mouseScrollSpeedY = 8.0,
 
+		wheelScrollSpeedX = 1.0, -- Per second. Relative to the font size.
+		wheelScrollSpeedY = 1.0,
+
 		dragMode           = "", -- "" | "character" | "word" | "line"
 		dragStartPosition1 = 0,
 		dragStartPosition2 = 0,
@@ -954,10 +961,11 @@ function InputField.getMouseScrollSpeedY(field)
 	return field.mouseScrollSpeedY
 end
 
--- field:setMouseScrollSpeed( speedX, speedY )
+-- field:setMouseScrollSpeed( speedX [, speedY=speedX ] )
 -- field:setMouseScrollSpeedX( speedX )
 -- field:setMouseScrollSpeedY( speedY )
 function InputField.setMouseScrollSpeed(field, speedX, speedY)
+	speedY                  = speedY or speedX
 	field.mouseScrollSpeedX = math.max(speedX, 0)
 	field.mouseScrollSpeedY = math.max(speedY, 0)
 end
@@ -970,6 +978,36 @@ end
 
 
 
+-- speedX, speedY = field:getWheelScrollSpeed( )
+-- speedX = field:getWheelScrollSpeedX( )
+-- speedY = field:getWheelScrollSpeedY( )
+function InputField.getWheelScrollSpeed(field)
+	return field.wheelScrollSpeedX, field.wheelScrollSpeedY
+end
+function InputField.getWheelScrollSpeedX(field)
+	return field.wheelScrollSpeedX
+end
+function InputField.getWheelScrollSpeedY(field)
+	return field.wheelScrollSpeedY
+end
+
+-- field:setWheelScrollSpeed( speedX [, speedY=speedX ] )
+-- field:setWheelScrollSpeedX( speedX )
+-- field:setWheelScrollSpeedY( speedY )
+function InputField.setWheelScrollSpeed(field, speedX, speedY)
+	speedY                  = speedY or speedX
+	field.wheelScrollSpeedX = math.max(speedX, 0)
+	field.wheelScrollSpeedY = math.max(speedY, 0)
+end
+function InputField.setWheelScrollSpeedX(field, speedX)
+	field.wheelScrollSpeedX = math.max(speedX, 0)
+end
+function InputField.setWheelScrollSpeedY(field, speedY)
+	field.wheelScrollSpeedY = math.max(speedY, 0)
+end
+
+
+
 -- delay = field:getDoubleClickMaxDelay( )
 function InputField.getDoubleClickMaxDelay(field)
 	return field.multiClickMaxDelay
@@ -1620,6 +1658,21 @@ function InputField.mousereleased(field, mx, my, mbutton)
 	return true
 end
 
+-- eventWasHandled = field:wheelmoved( deltaX, deltaY )
+function InputField.wheelmoved(field, dx, dy)
+	if LK.isDown("lshift","rshift") then
+		dx, dy = dy, dx
+	end
+
+	local fontH = field.font:getHeight()
+	field:scroll(
+		-dx * field.wheelScrollSpeedX*fontH,
+		-dy * field.wheelScrollSpeedY*fontH
+	)
+
+	return true -- Always handle event (for now).
+end
+
 
 
 -- field:releaseMouse( )

examples/multipleFields/main.lua

@@ -20,11 +20,10 @@ local LK = love.keyboard
 -- Values.
 --
 
-local FIELD_PADDING            = 6
-local FONT_LINE_HEIGHT         = 1.3
-local SCROLLBAR_WIDTH          = 5
-local BLINK_INTERVAL           = 0.90
-local MOUSE_WHEEL_SCROLL_SPEED = 15
+local FIELD_PADDING    = 6
+local FONT_LINE_HEIGHT = 1.3
+local SCROLLBAR_WIDTH  = 5
+local BLINK_INTERVAL   = 0.90
 
 local ENABLE_CJK              = false
 local COMPOSITION_BOX_PADDING = 3
@@ -211,7 +210,7 @@ function love.wheelmoved(dx, dy)
 	local hoveredTextInput = getTextInputAtCoords(love.mouse.getPosition())
 
 	if hoveredTextInput then
-		hoveredTextInput.field:scroll(-dx*MOUSE_WHEEL_SCROLL_SPEED, -dy*MOUSE_WHEEL_SCROLL_SPEED)
+		hoveredTextInput.field:wheelmoved(dx, dy)
 	end
 end
 

examples/simple/main.lua

@@ -24,9 +24,8 @@ local FIELD_INNER_Y      = FIELD_OUTER_Y + FIELD_PADDING
 local FIELD_INNER_WIDTH  = FIELD_OUTER_WIDTH  - 2*FIELD_PADDING
 local FIELD_INNER_HEIGHT = FIELD_OUTER_HEIGHT - 2*FIELD_PADDING
 
-local SCROLLBAR_WIDTH          = 5
-local BLINK_INTERVAL           = 0.90
-local MOUSE_WHEEL_SCROLL_SPEED = 10
+local SCROLLBAR_WIDTH = 5
+local BLINK_INTERVAL  = 0.90
 
 
 
@@ -68,7 +67,7 @@ function love.mousereleased(mx, my, mbutton, pressCount)
 end
 
 function love.wheelmoved(dx, dy)
-	field:scroll(-dx*MOUSE_WHEEL_SCROLL_SPEED, -dy*MOUSE_WHEEL_SCROLL_SPEED)
+	field:wheelmoved(dx, dy)
 end