Merge pull request #11148 from pchote/improve-scroll-input

Expose separate middle and right mouse scroll config.
This commit is contained in:
reaperrr
2016-05-13 22:44:18 +02:00
5 changed files with 107 additions and 72 deletions

View File

@@ -337,84 +337,97 @@ Container@SETTINGS_PANEL:
Width: 250
Height: 20
Font: Regular
Text: Left-Click Orders
Label@MOUSE_SCROLL_LABEL:
Text: Left-click Orders
Label@MIDDLE_MOUSE_SCROLL_LABEL:
X: PARENT_RIGHT - WIDTH - 120
Y: 39
Width: 160
Height: 20
Font: Regular
Text: Mouse Scrolling Method:
Text: Middle-mouse Scrolling:
Align: Right
DropDownButton@MOUSE_SCROLL:
DropDownButton@MIDDLE_MOUSE_SCROLL:
X: PARENT_RIGHT - WIDTH - 15
Y: 38
Width: 100
Height: 25
Font: Regular
Text: Enabled
Checkbox@ALLOW_ZOOM_CHECKBOX:
X: 15
Y: 70
Width: 130
Height: 20
Font: Regular
Text: Allow zoom
Label@ZOOM_MODIFIER_LABEL:
Label@MIDDLE_MOUSE_SCROLL_LABEL:
X: PARENT_RIGHT - WIDTH - 120
Y: 68
Y: 69
Width: 160
Height: 20
Font: Regular
Text: Modifier used to zoom:
Text: Right-mouse Scrolling:
Align: Right
DropDownButton@RIGHT_MOUSE_SCROLL:
X: PARENT_RIGHT - WIDTH - 15
Y: 68
Width: 100
Height: 25
Font: Regular
Label@ZOOM_MODIFIER_LABEL:
X: PARENT_RIGHT - WIDTH - 120
Y: 98
Width: 160
Height: 20
Font: Regular
Text: Scroll-zoom Modifier:
Align: Right
DropDownButton@ZOOM_MODIFIER:
X: PARENT_RIGHT - WIDTH - 15
Y: 68
Y: 98
Width: 100
Height: 25
Font: Regular
Text: Alt
Checkbox@EDGESCROLL_CHECKBOX:
X: 15
Y: 100
Y: 70
Width: 130
Height: 20
Font: Regular
Text: Edge Scrolling
Checkbox@ALLOW_ZOOM_CHECKBOX:
X: 15
Y: 100
Width: 130
Height: 20
Font: Regular
Text: Scroll Zooming
Checkbox@LOCKMOUSE_CHECKBOX:
X: 15
Y: 130
Width: 130
Height: 20
Font: Regular
Text: Lock mouse to window
Text: Lock Mouse to Window
Label@SCROLL_SPEED_LABEL:
X: PARENT_RIGHT - WIDTH - 270
Y: 97
Y: 127
Width: 95
Height: 25
Text: Scroll Speed:
Align: Right
Slider@SCROLLSPEED_SLIDER:
X: PARENT_RIGHT - WIDTH - 15
Y: 103
Width: 250
X: PARENT_RIGHT - WIDTH - 170
Y: 133
Width: 100
Height: 20
Ticks: 5
MinimumValue: 10
MaximumValue: 50
Label@UI_SCROLL_SPEED_LABEL:
X: PARENT_RIGHT - WIDTH - 270
X: PARENT_RIGHT - WIDTH - 106
Y: 127
Width: 95
Height: 25
Text: UI Scroll Speed:
Text: UI Scroll:
Align: Right
Slider@UI_SCROLLSPEED_SLIDER:
X: PARENT_RIGHT - WIDTH - 15
X: PARENT_RIGHT - WIDTH - 6
Y: 133
Width: 250
Width: 100
Height: 20
Ticks: 5
MinimumValue: 1