GitHub/skyline
2
0
Fork 0
mirror of https://github.com/skyline-emu/skyline.git synced 2024-12-25 23:25:28 +03:00
Code Issues Packages Projects Releases Wiki Activity

Use 1.0 as the default OSC button scale value

Browse Source 
The default value was previously 1.15.
This commit is contained in:
lynxnb 2023-04-16 21:30:48 +02:00 committed by Billy Laws
parent 821cdb8d72
commit 32f995165c
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/emu/skyline/input/onscreen/OnScreenConfiguration.kt
View File

@ -24,7 +24,7 @@ interface OnScreenConfiguration {
const val MinScale = 0.5f
const val MaxScale = 2.5f
const val DefaultScale = 1.15f
const val DefaultScale = 1f
val DefaultTextColor = SwitchColors.BLACK.color
val DefaultBackgroundColor = SwitchColors.WHITE.color

38
app/src/main/java/emu/skyline/input/onscreen/OnScreenItemDefinitions.kt
View File

@ -203,24 +203,24 @@ class TriggerButton(
)
class Controls(onScreenControllerView : OnScreenControllerView) {
private val buttonA = CircularButton(onScreenControllerView, A, 0.81f, 0.73f, 0.025f)
private val buttonB = CircularButton(onScreenControllerView, B, 0.76f, 0.85f, 0.025f)
private val buttonX = CircularButton(onScreenControllerView, X, 0.76f, 0.61f, 0.025f)
private val buttonY = CircularButton(onScreenControllerView, Y, 0.71f, 0.73f, 0.025f)
private val buttonA = CircularButton(onScreenControllerView, A, 0.81f, 0.73f, 0.029f)
private val buttonB = CircularButton(onScreenControllerView, B, 0.76f, 0.85f, 0.029f)
private val buttonX = CircularButton(onScreenControllerView, X, 0.76f, 0.61f, 0.029f)
private val buttonY = CircularButton(onScreenControllerView, Y, 0.71f, 0.73f, 0.029f)
private val buttonDpadLeft = CircularButton(onScreenControllerView, DpadLeft, 0.06f, 0.53f, 0.025f)
private val buttonDpadUp = CircularButton(onScreenControllerView, DpadUp, 0.11f, 0.41f, 0.025f)
private val buttonDpadRight = CircularButton(onScreenControllerView, DpadRight, 0.16f, 0.53f, 0.025f)
private val buttonDpadDown = CircularButton(onScreenControllerView, DpadDown, 0.11f, 0.65f, 0.025f)
private val buttonDpadLeft = CircularButton(onScreenControllerView, DpadLeft, 0.06f, 0.53f, 0.029f)
private val buttonDpadUp = CircularButton(onScreenControllerView, DpadUp, 0.11f, 0.41f, 0.029f)
private val buttonDpadRight = CircularButton(onScreenControllerView, DpadRight, 0.16f, 0.53f, 0.029f)
private val buttonDpadDown = CircularButton(onScreenControllerView, DpadDown, 0.11f, 0.65f, 0.029f)
private val buttonL = RectangularButton(onScreenControllerView, L, 0.1f, 0.22f, 0.09f, 0.1f)
private val buttonR = RectangularButton(onScreenControllerView, R, 0.9f, 0.22f, 0.09f, 0.1f)
private val buttonL = RectangularButton(onScreenControllerView, L, 0.1f, 0.22f, 0.105f, 0.115f)
private val buttonR = RectangularButton(onScreenControllerView, R, 0.9f, 0.22f, 0.105f, 0.115f)
private val buttonZL = TriggerButton(onScreenControllerView, ZL, 0.1f, 0.08f, 0.09f, 0.1f)
private val buttonZR = TriggerButton(onScreenControllerView, ZR, 0.9f, 0.08f, 0.09f, 0.1f)
private val buttonZL = TriggerButton(onScreenControllerView, ZL, 0.1f, 0.08f, 0.105f, 0.115f)
private val buttonZR = TriggerButton(onScreenControllerView, ZR, 0.9f, 0.08f, 0.105f, 0.115f)
private val buttonL3 = CircularButton(onScreenControllerView, L3, 0.12f, 0.87f, 0.025f, defaultEnabled = false)
private val buttonR3 = CircularButton(onScreenControllerView, R3, 0.88f, 0.87f, 0.025f, defaultEnabled = false)
private val buttonL3 = CircularButton(onScreenControllerView, L3, 0.12f, 0.87f, 0.029f, defaultEnabled = false)
private val buttonR3 = CircularButton(onScreenControllerView, R3, 0.88f, 0.87f, 0.029f, defaultEnabled = false)
private val circularButtonPairs = listOf(setOf(buttonA, buttonB, buttonX, buttonY), setOf(buttonDpadLeft, buttonDpadUp, buttonDpadRight, buttonDpadDown))
@ -231,16 +231,16 @@ class Controls(onScreenControllerView : OnScreenControllerView) {
val buttonPairs = circularButtonPairs + triggerButtonPairs
val circularButtons = circularButtonPairs.flatten() + stickButtons + listOf(
CircularButton(onScreenControllerView, Plus, 0.57f, 0.85f, 0.025f),
CircularButton(onScreenControllerView, Minus, 0.43f, 0.85f, 0.025f),
CircularButton(onScreenControllerView, Menu, 0.5f, 0.85f, 0.025f)
CircularButton(onScreenControllerView, Plus, 0.57f, 0.85f, 0.029f),
CircularButton(onScreenControllerView, Minus, 0.43f, 0.85f, 0.029f),
CircularButton(onScreenControllerView, Menu, 0.5f, 0.85f, 0.029f)
)
val joysticks = listOf(
JoystickButton(onScreenControllerView, Left, 0.24f, 0.75f, 0.053f),
JoystickButton(onScreenControllerView, Right, 0.9f, 0.53f, 0.053f)
)
JoystickButton(onScreenControllerView, Left, 0.24f, 0.75f, 0.06f),
JoystickButton(onScreenControllerView, Right, 0.9f, 0.53f, 0.06f)
val rectangularButtons = listOf(buttonL, buttonR)
val triggerButtons = listOf(buttonZL, buttonZR)