Skip to content

Commit 476860e

Browse files
committed
Fix Windows specific issues
1 parent 806b0ee commit 476860e

File tree

6 files changed

+11
-4
lines changed

6 files changed

+11
-4
lines changed

scenes/popups/first_time/EmulatorsSection.gd

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ func _ready():
1313
n_systems.get_popup().max_size.y = RetroHubUI.max_popupmenu_height + 50
1414

1515
func grab_focus():
16-
RetroHubConfig.load_emulators()
1716
if RetroHubConfig.config.accessibility_screen_reader_enabled:
1817
n_intro_lbl.grab_focus()
1918
else:

scenes/popups/first_time/EmulatorsSection.tscn

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ layout_mode = 3
99
anchors_preset = 15
1010
anchor_right = 1.0
1111
anchor_bottom = 1.0
12+
grow_horizontal = 2
13+
grow_vertical = 2
1214
size_flags_horizontal = 3
1315
size_flags_vertical = 3
1416
script = ExtResource("2")

scenes/popups/first_time/ImportSettingsSection.gd

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ func _ready():
2222
n_import_options.get_popup().max_size.y = RetroHubUI.max_popupmenu_height
2323

2424
func grab_focus():
25+
# Importers need emulator info already
26+
RetroHubConfig.load_emulators()
2527
if RetroHubConfig.config.accessibility_screen_reader_enabled:
2628
n_intro_lbl.grab_focus()
2729
else:

scenes/root/FileSystemPopup.gd

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,10 @@ func _ready():
7676
create_folder_cancel_button.focus_neighbor_top = path
7777

7878
# Force the recent paths option button to wrap text
79-
var recent_paths : OptionButton = get_vbox().get_child(0, true).get_child(11, true).get_child(0, true)
80-
recent_paths.fit_to_longest_item = false
79+
# This field doesn't exists on Windows for some reason
80+
if FileUtils.get_os_id() != FileUtils.OS_ID.WINDOWS:
81+
var recent_paths : OptionButton = get_vbox().get_child(0, true).get_child(11, true).get_child(0, true)
82+
recent_paths.fit_to_longest_item = false
8183

8284
func _unhandled_input(event):
8385
if RetroHub.is_input_echo() or not visible:

tests/TestImporter.gd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
extends Control
22

33
func _ready():
4-
var importer := EmulationStationImporter.new()
4+
var importer := RetroArchImporter.new()
55
print("Availability: ", importer.is_available())
66
print("Size: ", importer.get_estimated_size())
77
print("Avail size: ", FileUtils.get_space_left())

tests/TestImporter.tscn

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,6 @@ layout_mode = 3
77
anchors_preset = 15
88
anchor_right = 1.0
99
anchor_bottom = 1.0
10+
grow_horizontal = 2
11+
grow_vertical = 2
1012
script = ExtResource("1")

0 commit comments

Comments
 (0)