Skip to content

Commit e058c58

Browse files
Bit-CrustBit-Crust
committed
Fix insufficient input mapping menu height obscuring ~12 inputs, and made all visible to all devices.
1 parent 7304c56 commit e058c58

File tree

3 files changed

+27
-27
lines changed

3 files changed

+27
-27
lines changed

‎Data/Base.rte/GUIs/SettingsGUI.ini

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1612,7 +1612,7 @@ Parent = CollectionBoxScrollingMappingClipBox
16121612
X = 0
16131613
Y = 0
16141614
Width = 440
1615-
Height = 369
1615+
Height = 540
16161616
Visible = True
16171617
Enabled = True
16181618
Name = CollectionBoxScrollingMappingBox
@@ -2465,7 +2465,7 @@ Text = [InputKey]
24652465
[LabelInputName29]
24662466
ControlType = LABEL
24672467
Parent = CollectionBoxScrollingMappingBox
2468-
X = 215
2468+
X = 5
24692469
Y = 355
24702470
Width = 110
24712471
Height = 20
@@ -2481,7 +2481,7 @@ VAlignment = middle
24812481
[ButtonInputKey29]
24822482
ControlType = BUTTON
24832483
Parent = CollectionBoxScrollingMappingBox
2484-
X = 330
2484+
X = 120
24852485
Y = 355
24862486
Width = 95
24872487
Height = 20
@@ -2496,7 +2496,7 @@ Text = [InputKey]
24962496
ControlType = LABEL
24972497
Parent = CollectionBoxScrollingMappingBox
24982498
X = 215
2499-
Y = 380
2499+
Y = 355
25002500
Width = 110
25012501
Height = 20
25022502
Visible = True
@@ -2512,7 +2512,7 @@ VAlignment = middle
25122512
ControlType = BUTTON
25132513
Parent = CollectionBoxScrollingMappingBox
25142514
X = 330
2515-
Y = 380
2515+
Y = 355
25162516
Width = 95
25172517
Height = 20
25182518
Visible = True
@@ -2525,7 +2525,7 @@ Text = [InputKey]
25252525
[LabelInputName31]
25262526
ControlType = LABEL
25272527
Parent = CollectionBoxScrollingMappingBox
2528-
X = 215
2528+
X = 5
25292529
Y = 380
25302530
Width = 110
25312531
Height = 20
@@ -2541,7 +2541,7 @@ VAlignment = middle
25412541
[ButtonInputKey31]
25422542
ControlType = BUTTON
25432543
Parent = CollectionBoxScrollingMappingBox
2544-
X = 330
2544+
X = 120
25452545
Y = 380
25462546
Width = 95
25472547
Height = 20
@@ -2585,8 +2585,8 @@ Text = [InputKey]
25852585
[LabelInputName33]
25862586
ControlType = LABEL
25872587
Parent = CollectionBoxScrollingMappingBox
2588-
X = 215
2589-
Y = 380
2588+
X = 5
2589+
Y = 405
25902590
Width = 110
25912591
Height = 20
25922592
Visible = True
@@ -2601,8 +2601,8 @@ VAlignment = middle
26012601
[ButtonInputKey33]
26022602
ControlType = BUTTON
26032603
Parent = CollectionBoxScrollingMappingBox
2604-
X = 330
2605-
Y = 380
2604+
X = 120
2605+
Y = 405
26062606
Width = 95
26072607
Height = 20
26082608
Visible = True
@@ -2616,7 +2616,7 @@ Text = [InputKey]
26162616
ControlType = LABEL
26172617
Parent = CollectionBoxScrollingMappingBox
26182618
X = 215
2619-
Y = 380
2619+
Y = 405
26202620
Width = 110
26212621
Height = 20
26222622
Visible = True
@@ -2632,7 +2632,7 @@ VAlignment = middle
26322632
ControlType = BUTTON
26332633
Parent = CollectionBoxScrollingMappingBox
26342634
X = 330
2635-
Y = 380
2635+
Y = 405
26362636
Width = 95
26372637
Height = 20
26382638
Visible = True

‎Data/Base.rte/GUIs/SettingsPauseGUI.ini

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1613,7 +1613,7 @@ Parent = CollectionBoxScrollingMappingClipBox
16131613
X = 0
16141614
Y = 0
16151615
Width = 440
1616-
Height = 369
1616+
Height = 540
16171617
Visible = True
16181618
Enabled = True
16191619
Name = CollectionBoxScrollingMappingBox
@@ -2466,7 +2466,7 @@ Text = [InputKey]
24662466
[LabelInputName29]
24672467
ControlType = LABEL
24682468
Parent = CollectionBoxScrollingMappingBox
2469-
X = 215
2469+
X = 5
24702470
Y = 355
24712471
Width = 110
24722472
Height = 20
@@ -2482,7 +2482,7 @@ VAlignment = middle
24822482
[ButtonInputKey29]
24832483
ControlType = BUTTON
24842484
Parent = CollectionBoxScrollingMappingBox
2485-
X = 330
2485+
X = 120
24862486
Y = 355
24872487
Width = 95
24882488
Height = 20
@@ -2497,7 +2497,7 @@ Text = [InputKey]
24972497
ControlType = LABEL
24982498
Parent = CollectionBoxScrollingMappingBox
24992499
X = 215
2500-
Y = 380
2500+
Y = 355
25012501
Width = 110
25022502
Height = 20
25032503
Visible = True
@@ -2513,7 +2513,7 @@ VAlignment = middle
25132513
ControlType = BUTTON
25142514
Parent = CollectionBoxScrollingMappingBox
25152515
X = 330
2516-
Y = 380
2516+
Y = 355
25172517
Width = 95
25182518
Height = 20
25192519
Visible = True
@@ -2526,7 +2526,7 @@ Text = [InputKey]
25262526
[LabelInputName31]
25272527
ControlType = LABEL
25282528
Parent = CollectionBoxScrollingMappingBox
2529-
X = 215
2529+
X = 5
25302530
Y = 380
25312531
Width = 110
25322532
Height = 20
@@ -2542,7 +2542,7 @@ VAlignment = middle
25422542
[ButtonInputKey31]
25432543
ControlType = BUTTON
25442544
Parent = CollectionBoxScrollingMappingBox
2545-
X = 330
2545+
X = 120
25462546
Y = 380
25472547
Width = 95
25482548
Height = 20
@@ -2586,8 +2586,8 @@ Text = [InputKey]
25862586
[LabelInputName33]
25872587
ControlType = LABEL
25882588
Parent = CollectionBoxScrollingMappingBox
2589-
X = 215
2590-
Y = 380
2589+
X = 5
2590+
Y = 405
25912591
Width = 110
25922592
Height = 20
25932593
Visible = True
@@ -2602,8 +2602,8 @@ VAlignment = middle
26022602
[ButtonInputKey33]
26032603
ControlType = BUTTON
26042604
Parent = CollectionBoxScrollingMappingBox
2605-
X = 330
2606-
Y = 380
2605+
X = 120
2606+
Y = 405
26072607
Width = 95
26082608
Height = 20
26092609
Visible = True
@@ -2617,7 +2617,7 @@ Text = [InputKey]
26172617
ControlType = LABEL
26182618
Parent = CollectionBoxScrollingMappingBox
26192619
X = 215
2620-
Y = 380
2620+
Y = 405
26212621
Width = 110
26222622
Height = 20
26232623
Visible = True
@@ -2633,7 +2633,7 @@ VAlignment = middle
26332633
ControlType = BUTTON
26342634
Parent = CollectionBoxScrollingMappingBox
26352635
X = 330
2636-
Y = 380
2636+
Y = 405
26372637
Width = 95
26382638
Height = 20
26392639
Visible = True

‎Source/Menus/SettingsInputMappingGUI.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ void SettingsInputMappingGUI::UpdateMappingButtonLabels() {
123123
m_InputMapButton[i]->SetText(!inputDescription.empty() ? "[" + inputDescription + "]" : "[Undefined]");
124124
}
125125
// Adjust the scrolling box scroll range to hide mappings that are only relevant to gamepads.
126-
m_InputMapScrollingBoxScrollbar->SetMaximum(m_InputMapScrollingBox->GetHeight() - ((m_ConfiguringPlayerInputScheme->GetDevice() < InputDevice::DEVICE_GAMEPAD_1) ? 141 : -8));
126+
m_InputMapScrollingBoxScrollbar->SetMaximum(m_InputMapScrollingBox->GetHeight());
127127
m_InputMapScrollingBoxScrollbar->SetPageSize(m_InputMapScrollingBoxScrollbar->GetMaximum() / 2);
128128
}
129129

0 commit comments

Comments
 (0)