misc/window_management: Fix screen size and label order (#848)

godotengine · Feb 24, 2023 · 73d96b7 · 73d96b7
1 parent da6fffb
commit 73d96b7
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/misc/window_management/control.gd b/misc/window_management/control.gd
@@ -9,6 +9,10 @@ func _ready():
 		set_physics_process(false)
 		set_process_input(false)
 
+	# See godotengine/godot#73563, fetching the refresh rate on every frame may be slow on some platforms.
+	$Labels/Label_Screen0_RefreshRate.text = "Screen0 Refresh Rate: %.2f Hz" % DisplayServer.screen_get_refresh_rate()
+	if DisplayServer.get_screen_count() > 1:
+		$Labels/Label_Screen1_RefreshRate.text = "Screen1 Refresh Rate: %.2f Hz" % DisplayServer.screen_get_refresh_rate(1)
 
 func _physics_process(_delta):
 	var modetext = "Mode: "
@@ -37,18 +41,16 @@ func _physics_process(_delta):
 	$Labels/Label_Screen0_Resolution.text = str("Screen0 Resolution:\n", DisplayServer.screen_get_size())
 	$Labels/Label_Screen0_Position.text = str("Screen0 Position:\n", DisplayServer.screen_get_position())
 	$Labels/Label_Screen0_DPI.text = str("Screen0 DPI: ", DisplayServer.screen_get_dpi())
-	$Labels/Label_Screen0_RefreshRate.text = "Screen0 Refresh Rate: %.2f Hz" % DisplayServer.screen_get_refresh_rate()
 
 	if DisplayServer.get_screen_count() > 1:
 		$Buttons/Button_Screen0.show()
 		$Buttons/Button_Screen1.show()
 		$Labels/Label_Screen1_Resolution.show()
 		$Labels/Label_Screen1_Position.show()
 		$Labels/Label_Screen1_DPI.show()
-		$Labels/Label_Screen1_Resolution.text = str("Screen1 Resolution:\n", DisplayServer.window_get_size(1))
+		$Labels/Label_Screen1_Resolution.text = str("Screen1 Resolution:\n", DisplayServer.screen_get_size(1))
 		$Labels/Label_Screen1_Position.text = str("Screen1 Position:\n", DisplayServer.screen_get_position(1))
 		$Labels/Label_Screen1_DPI.text = str("Screen1 DPI: ", DisplayServer.screen_get_dpi(1))
-		$Labels/Label_Screen1_RefreshRate.text = "Screen1 Refresh Rate: %.2f Hz" % DisplayServer.screen_get_refresh_rate(1)
 	else:
 		$Buttons/Button_Screen0.hide()
 		$Buttons/Button_Screen1.hide()

diff --git a/misc/window_management/window_management.tscn b/misc/window_management/window_management.tscn
@@ -131,6 +131,14 @@ text = "Screen1"
 metadata/_edit_layout_mode = 0
 metadata/_edit_use_custom_anchors = false
 
+[node name="Label_MouseModes" type="Label" parent="Control/Buttons"]
+layout_mode = 2
+size_flags_horizontal = 2
+size_flags_vertical = 0
+text = "MouseModes:"
+metadata/_edit_layout_mode = 1
+metadata/_edit_use_custom_anchors = false
+
 [node name="Button_MouseModeVisible" type="Button" parent="Control/Buttons"]
 layout_mode = 2
 size_flags_horizontal = 2
@@ -186,14 +194,6 @@ A, D: Strafe left, right"
 metadata/_edit_layout_mode = 1
 metadata/_edit_use_custom_anchors = false
 
-[node name="Label_MouseModes" type="Label" parent="Control/Buttons"]
-layout_mode = 2
-size_flags_horizontal = 2
-size_flags_vertical = 0
-text = "MouseModes:"
-metadata/_edit_layout_mode = 1
-metadata/_edit_use_custom_anchors = false
-
 [node name="Labels" type="VBoxContainer" parent="Control"]
 layout_mode = 1
 anchors_preset = 11