Merge pull request #740 from voylin/FixWindowManagement4.0

Fix window management demo for 4.0

misc/window_management/control.gd

@@ -11,7 +11,7 @@ func _ready():
 
 
 func _physics_process(_delta):
-	var modetext = "Mode:\n"
+	var modetext = "Mode: "
 	if DisplayServer.window_get_mode() == DisplayServer.WINDOW_MODE_FULLSCREEN:
 		modetext += "Fullscreen\n"
 	else:
@@ -24,43 +24,43 @@ func _physics_process(_delta):
 		modetext += "Maximized\n"
 	if Input.get_mouse_mode() == Input.MOUSE_MODE_CAPTURED:
 		modetext += "MouseGrab\n"
-		$Label_MouseModeCaptured_KeyInfo.show()
+		$Buttons/Label_MouseModeCaptured_KeyInfo.show()
 	else:
-		$Label_MouseModeCaptured_KeyInfo.hide()
-
-	$Label_Mode.text = modetext
-	$Label_Position.text = str("Position:\n", DisplayServer.window_get_position())
-	$Label_Size.text = str("Size:\n", DisplayServer.window_get_size())
-	$Label_MousePosition.text = str("Mouse Position:\n", mousepos)
-	$Label_Screen_Count.text = str("Screen_Count:\n", DisplayServer.get_screen_count())
-	$Label_Screen_Current.text = str("Screen:\n", DisplayServer.window_get_current_screen())
-	$Label_Screen0_Resolution.text = str("Screen0 Resolution:\n", DisplayServer.screen_get_size())
-	$Label_Screen0_Position.text = str("Screen0 Position:\n", DisplayServer.screen_get_position())
-	$Label_Screen0_DPI.text = str("Screen0 DPI:\n", DisplayServer.screen_get_dpi())
+		$Buttons/Label_MouseModeCaptured_KeyInfo.hide()
+
+	$Labels/Label_Mode.text = modetext
+	$Labels/Label_Position.text = str("Position: ", DisplayServer.window_get_position())
+	$Labels/Label_Size.text = str("Size: ", DisplayServer.window_get_size())
+	$Labels/Label_MousePosition.text = str("Mouse Position: ", mousepos)
+	$Labels/Label_Screen_Count.text = str("Screen_Count: ", DisplayServer.get_screen_count())
+	$Labels/Label_Screen_Current.text = str("Screen: ", DisplayServer.window_get_current_screen())
+	$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())
 
 	if DisplayServer.get_screen_count() > 1:
-		$Button_Screen0.show()
-		$Button_Screen1.show()
-		$Label_Screen1_Resolution.show()
-		$Label_Screen1_Position.show()
-		$Label_Screen1_DPI.show()
-		$Label_Screen1_Resolution.text = str("Screen1 Resolution:\n", DisplayServer.window_get_size(1))
-		$Label_Screen1_Position.text = str("Screen1 Position:\n", DisplayServer.screen_get_position(1))
-		$Label_Screen1_DPI.text = str("Screen1 DPI:\n", DisplayServer.screen_get_dpi(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_Position.text = str("Screen1 Position:\n", DisplayServer.screen_get_position(1))
+		$Labels/Label_Screen1_DPI.text = str("Screen1 DPI: ", DisplayServer.screen_get_dpi(1))
 	else:
-		$Button_Screen0.hide()
-		$Button_Screen1.hide()
-		$Label_Screen1_Resolution.hide()
-		$Label_Screen1_Position.hide()
-		$Label_Screen1_DPI.hide()
+		$Buttons/Button_Screen0.hide()
+		$Buttons/Button_Screen1.hide()
+		$Labels/Label_Screen1_Resolution.hide()
+		$Labels/Label_Screen1_Position.hide()
+		$Labels/Label_Screen1_DPI.hide()
 
-	$Button_Fullscreen.set_pressed(DisplayServer.window_get_mode() == DisplayServer.WINDOW_MODE_FULLSCREEN)
-	$Button_FixedSize.set_pressed(DisplayServer.window_get_flag(DisplayServer.WINDOW_FLAG_RESIZE_DISABLED))
-	$Button_Minimized.set_pressed(DisplayServer.window_get_mode() == DisplayServer.WINDOW_MODE_MINIMIZED)
-	$Button_Maximized.set_pressed(DisplayServer.window_get_mode() == DisplayServer.WINDOW_MODE_MAXIMIZED)
-	$Button_MouseModeVisible.set_pressed(Input.get_mouse_mode() == Input.MOUSE_MODE_VISIBLE)
-	$Button_MouseModeHidden.set_pressed(Input.get_mouse_mode() == Input.MOUSE_MODE_HIDDEN)
-	$Button_MouseModeCaptured.set_pressed(Input.get_mouse_mode() == Input.MOUSE_MODE_CAPTURED)
+	$Buttons/Button_Fullscreen.set_pressed(DisplayServer.window_get_mode() == DisplayServer.WINDOW_MODE_FULLSCREEN)
+	$Buttons/Button_FixedSize.set_pressed(DisplayServer.window_get_flag(DisplayServer.WINDOW_FLAG_RESIZE_DISABLED))
+	$Buttons/Button_Minimized.set_pressed(DisplayServer.window_get_mode() == DisplayServer.WINDOW_MODE_MINIMIZED)
+	$Buttons/Button_Maximized.set_pressed(DisplayServer.window_get_mode() == DisplayServer.WINDOW_MODE_MAXIMIZED)
+	$Buttons/Button_MouseModeVisible.set_pressed(Input.get_mouse_mode() == Input.MOUSE_MODE_VISIBLE)
+	$Buttons/Button_MouseModeHidden.set_pressed(Input.get_mouse_mode() == Input.MOUSE_MODE_HIDDEN)
+	$Buttons/Button_MouseModeCaptured.set_pressed(Input.get_mouse_mode() == Input.MOUSE_MODE_CAPTURED)
 
 
 func _unhandled_input(event):
@@ -82,40 +82,41 @@ func _unhandled_input(event):
 
 func check_wm_api():
 	var s = ""
-	if not OS.has_method("get_screen_count"):
+	if not DisplayServer.has_method("get_screen_count"):
 		s += " - get_screen_count()\n"
-	if not OS.has_method("get_current_screen"):
-		s += " - get_current_screen()\n"
-	if not OS.has_method("set_current_screen"):
-		s += " - set_current_screen()\n"
-	if not OS.has_method("get_screen_position"):
-		s += " - get_screen_position()\n"
-	if not OS.has_method("get_screen_size"):
-		s += " - get_screen_size()\n"
-	if not OS.has_method("get_window_position"):
-		s += " - get_window_position()\n"
-	if not OS.has_method("set_window_position"):
-		s += " - set_window_position()\n"
-	if not OS.has_method("get_window_size"):
+	if not DisplayServer.has_method("window_get_current_screen"):
+		s += " - window_get_current_screen()\n"
+	if not DisplayServer.has_method("window_set_current_screen"):
+		s += " - window_set_current_screen()\n"
+	if not DisplayServer.has_method("screen_get_position"):
+		s += " - screen_get_position()\n"
+	if not DisplayServer.has_method("window_get_size"):
+		s += " - window_get_size()\n"
+	if not DisplayServer.has_method("window_get_position"):
+		s += " - window_get_position()\n"
+	if not DisplayServer.has_method("window_set_position"):
+		s += " - window_set_position()\n"
+	if not DisplayServer.has_method("window_get_size"):
 		s += " - get_window_size()\n"
-	if not OS.has_method("set_window_size"):
-		s += " - set_window_size()\n"
-	if not OS.has_method("set_window_fullscreen"):
-		s += " - set_window_fullscreen()\n"
-	if not OS.has_method("is_window_fullscreen"):
-		s += " - is_window_fullscreen()\n"
-	if not OS.has_method("set_window_resizable"):
-		s += " - set_window_resizable()\n"
-	if not OS.has_method("is_window_resizable"):
-		s += " - is_window_resizable()\n"
-	if not OS.has_method("set_window_minimized"):
-		s += " - set_window_minimized()\n"
-	if not OS.has_method("is_window_minimized"):
-		s += " - is_window_minimized()\n"
-	if not OS.has_method("set_window_maximized"):
-		s += " - set_window_maximized()\n"
-	if not OS.has_method("is_window_maximized"):
-		s += " - is_window_maximized()\n"
+	if not DisplayServer.has_method("window_set_size"):
+		s += " - window_set_size()\n"
+# These function are no longer and this is set through flags!
+#	if not DisplayServer.has_method("set_window_fullscreen"):
+#		s += " - set_window_fullscreen()\n"
+#	if not DisplayServer.window_get_flag() OS.has_method("is_window_fullscreen"):
+#		s += " - is_window_fullscreen()\n"
+#	if not OS.has_method("set_window_resizable"):
+#		s += " - set_window_resizable()\n"
+#	if not OS.has_method("is_window_resizable"):
+#		s += " - is_window_resizable()\n"
+#	if not OS.has_method("set_window_minimized"):
+#		s += " - set_window_minimized()\n"
+#	if not OS.has_method("is_window_minimized"):
+#		s += " - is_window_minimized()\n"
+#	if not OS.has_method("set_window_maximized"):
+#		s += " - set_window_maximized()\n"
+#	if not OS.has_method("is_window_maximized"):
+#		s += " - is_window_maximized()\n"
 
 	if s.length() == 0:
 		return true

misc/window_management/project.godot

@@ -18,7 +18,7 @@ config/features=PackedStringArray("4.0")
 
 [display]
 
-window/stretch/mode="2d"
+window/stretch/mode="canvas_items"
 window/stretch/aspect="expand"
 window/size/width=800
 window/fullscreen=false

misc/window_management/window_management.tscn

@@ -25,11 +25,19 @@ size_flags_horizontal = 2
 size_flags_vertical = 2
 script = ExtResource( "2" )
 
-[node name="Button_Fullscreen" type="Button" parent="Control"]
-offset_left = 23.0
-offset_top = 12.0
-offset_right = 123.0
-offset_bottom = 43.0
+[node name="Buttons" type="VBoxContainer" parent="Control"]
+anchor_bottom = 1.0
+offset_left = 10.0
+offset_top = 10.0
+offset_right = 335.0
+offset_bottom = -2.0
+theme_override_constants/separation = 5
+metadata/_edit_layout_mode = 0
+metadata/_edit_use_custom_anchors = false
+
+[node name="Button_Fullscreen" type="Button" parent="Control/Buttons"]
+offset_right = 87.0
+offset_bottom = 31.0
 size_flags_horizontal = 2
 size_flags_vertical = 2
 toggle_mode = true
@@ -37,11 +45,10 @@ text = "Fullscreen"
 metadata/_edit_layout_mode = 0
 metadata/_edit_use_custom_anchors = false
 
-[node name="Button_FixedSize" type="Button" parent="Control"]
-offset_left = 23.0
-offset_top = 52.0
-offset_right = 123.0
-offset_bottom = 83.0
+[node name="Button_FixedSize" type="Button" parent="Control/Buttons"]
+offset_top = 36.0
+offset_right = 80.0
+offset_bottom = 67.0
 size_flags_horizontal = 2
 size_flags_vertical = 2
 toggle_mode = true
@@ -49,11 +56,10 @@ text = "FixedSize"
 metadata/_edit_layout_mode = 0
 metadata/_edit_use_custom_anchors = false
 
-[node name="Button_Minimized" type="Button" parent="Control"]
-offset_left = 23.0
-offset_top = 92.0
-offset_right = 123.0
-offset_bottom = 123.0
+[node name="Button_Minimized" type="Button" parent="Control/Buttons"]
+offset_top = 72.0
+offset_right = 89.0
+offset_bottom = 103.0
 size_flags_horizontal = 2
 size_flags_vertical = 2
 toggle_mode = true
@@ -61,11 +67,10 @@ text = "Minimized"
 metadata/_edit_layout_mode = 0
 metadata/_edit_use_custom_anchors = false
 
-[node name="Button_Maximized" type="Button" parent="Control"]
-offset_left = 23.0
-offset_top = 132.0
-offset_right = 123.0
-offset_bottom = 163.0
+[node name="Button_Maximized" type="Button" parent="Control/Buttons"]
+offset_top = 108.0
+offset_right = 92.0
+offset_bottom = 139.0
 size_flags_horizontal = 2
 size_flags_vertical = 2
 toggle_mode = true
@@ -73,57 +78,50 @@ text = "Maximized"
 metadata/_edit_layout_mode = 0
 metadata/_edit_use_custom_anchors = false
 
-[node name="Button_MoveTo" type="Button" parent="Control"]
-offset_left = 23.0
-offset_top = 170.0
-offset_right = 123.0
-offset_bottom = 201.0
+[node name="Button_MoveTo" type="Button" parent="Control/Buttons"]
+offset_top = 144.0
+offset_right = 70.0
+offset_bottom = 175.0
 size_flags_horizontal = 2
 size_flags_vertical = 2
 text = "MoveTo"
 metadata/_edit_layout_mode = 0
 metadata/_edit_use_custom_anchors = false
 
-[node name="Button_Resize" type="Button" parent="Control"]
-offset_left = 23.0
-offset_top = 210.0
-offset_right = 123.0
-offset_bottom = 241.0
+[node name="Button_Resize" type="Button" parent="Control/Buttons"]
+offset_top = 180.0
+offset_right = 57.0
+offset_bottom = 211.0
 size_flags_horizontal = 2
 size_flags_vertical = 2
 text = "Resize"
 metadata/_edit_layout_mode = 0
 metadata/_edit_use_custom_anchors = false
 
-[node name="Button_Screen0" type="Button" parent="Control"]
-offset_left = 23.0
-offset_top = 250.0
-offset_right = 123.0
-offset_bottom = 281.0
+[node name="Button_Screen0" type="Button" parent="Control/Buttons"]
+offset_top = 216.0
+offset_right = 70.0
+offset_bottom = 247.0
 size_flags_horizontal = 2
 size_flags_vertical = 2
 text = "Screen0"
 metadata/_edit_layout_mode = 0
 metadata/_edit_use_custom_anchors = false
 
-[node name="Button_Screen1" type="Button" parent="Control"]
-offset_left = 23.0
-offset_top = 290.0
-offset_right = 123.0
-offset_bottom = 321.0
+[node name="Button_Screen1" type="Button" parent="Control/Buttons"]
+offset_top = 252.0
+offset_right = 70.0
+offset_bottom = 283.0
 size_flags_horizontal = 2
 size_flags_vertical = 2
 text = "Screen1"
 metadata/_edit_layout_mode = 0
 metadata/_edit_use_custom_anchors = false
 
-[node name="Button_MouseModeVisible" type="Button" parent="Control"]
-anchor_top = 1.0
-anchor_bottom = 1.0
-offset_left = 18.0
-offset_top = -217.0
-offset_right = 234.0
-offset_bottom = -186.0
+[node name="Button_MouseModeVisible" type="Button" parent="Control/Buttons"]
+offset_top = 288.0
+offset_right = 216.0
+offset_bottom = 319.0
 grow_vertical = 0
 size_flags_horizontal = 2
 size_flags_vertical = 2
@@ -132,13 +130,10 @@ text = "[F1] MOUSE_MODE_VISIBLE"
 metadata/_edit_layout_mode = 1
 metadata/_edit_use_custom_anchors = false
 
-[node name="Button_MouseModeHidden" type="Button" parent="Control"]
-anchor_top = 1.0
-anchor_bottom = 1.0
-offset_left = 18.0
-offset_top = -182.0
-offset_right = 240.0
-offset_bottom = -151.0
+[node name="Button_MouseModeHidden" type="Button" parent="Control/Buttons"]
+offset_top = 324.0
+offset_right = 222.0
+offset_bottom = 355.0
 grow_vertical = 0
 size_flags_horizontal = 2
 size_flags_vertical = 2
@@ -147,13 +142,10 @@ text = "[F2] MOUSE_MODE_HIDDEN"
 metadata/_edit_layout_mode = 1
 metadata/_edit_use_custom_anchors = false
 
-[node name="Button_MouseModeCaptured" type="Button" parent="Control"]
-anchor_top = 1.0
-anchor_bottom = 1.0
-offset_left = 18.0
-offset_top = -147.0
-offset_right = 260.0
-offset_bottom = -116.0
+[node name="Button_MouseModeCaptured" type="Button" parent="Control/Buttons"]
+offset_top = 360.0
+offset_right = 242.0
+offset_bottom = 391.0
 grow_vertical = 0
 size_flags_horizontal = 2
 size_flags_vertical = 2
@@ -162,14 +154,61 @@ text = "[F3] MOUSE_MODE_CAPTURED"
 metadata/_edit_layout_mode = 1
 metadata/_edit_use_custom_anchors = false
 
-[node name="Label_Mode" type="Label" parent="Control"]
-minimum_size = Vector2(190, 0)
+[node name="Label_KeyInfo" type="Label" parent="Control/Buttons"]
+offset_top = 396.0
+offset_right = 295.0
+offset_bottom = 474.0
+grow_vertical = 0
+size_flags_horizontal = 2
+size_flags_vertical = 0
+text = "F1: Activate MOUSE_MODE_VISIBLE
+F2: Activate MOUSE_MODE_HIDDEN
+F3: Activate MOUSE_MODE_CAPTURED"
+metadata/_edit_layout_mode = 1
+metadata/_edit_use_custom_anchors = false
+
+[node name="Label_MouseModeCaptured_KeyInfo" type="Label" parent="Control/Buttons"]
+offset_top = 479.0
+offset_right = 325.0
+offset_bottom = 557.0
+grow_vertical = 0
+size_flags_horizontal = 2
+size_flags_vertical = 0
+text = "ESC: Deactivate MOUSE_MODE_CAPTURED
+W, S: Move forward, backward
+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"]
+offset_top = 562.0
+offset_right = 108.0
+offset_bottom = 588.0
+grow_vertical = 0
+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"]
 anchor_left = 1.0
 anchor_right = 1.0
-offset_left = -205.0
-offset_top = 156.0
-offset_right = -15.0
-offset_bottom = 182.0
+anchor_bottom = 1.0
+offset_left = -241.0
+offset_top = 10.0
+offset_right = -10.0
+offset_bottom = -10.0
+grow_horizontal = 0
+grow_vertical = 2
+theme_override_constants/separation = 10
+metadata/_edit_layout_mode = 1
+metadata/_edit_use_custom_anchors = false
+
+[node name="Label_Mode" type="Label" parent="Control/Labels"]
+minimum_size = Vector2(190, 0)
+offset_right = 190.0
+offset_bottom = 26.0
 grow_horizontal = 0
 size_flags_horizontal = 2
 size_flags_vertical = 0
@@ -177,14 +216,11 @@ text = "Mode:"
 metadata/_edit_layout_mode = 1
 metadata/_edit_use_custom_anchors = false
 
-[node name="Label_Position" type="Label" parent="Control"]
+[node name="Label_Position" type="Label" parent="Control/Labels"]
 minimum_size = Vector2(190, 0)
-anchor_left = 1.0
-anchor_right = 1.0
-offset_left = -205.0
-offset_top = 76.0
-offset_right = -15.0
-offset_bottom = 102.0
+offset_top = 36.0
+offset_right = 190.0
+offset_bottom = 62.0
 grow_horizontal = 0
 size_flags_horizontal = 2
 size_flags_vertical = 0
@@ -192,14 +228,11 @@ text = "Position:"
 metadata/_edit_layout_mode = 1
 metadata/_edit_use_custom_anchors = false
 
-[node name="Label_Size" type="Label" parent="Control"]
+[node name="Label_Size" type="Label" parent="Control/Labels"]
 minimum_size = Vector2(190, 0)
-anchor_left = 1.0
-anchor_right = 1.0
-offset_left = -205.0
-offset_top = 116.0
-offset_right = -15.0
-offset_bottom = 142.0
+offset_top = 72.0
+offset_right = 190.0
+offset_bottom = 98.0
 grow_horizontal = 0
 size_flags_horizontal = 2
 size_flags_vertical = 0
@@ -207,14 +240,11 @@ text = "Size:"
 metadata/_edit_layout_mode = 1
 metadata/_edit_use_custom_anchors = false
 
-[node name="Label_MousePosition" type="Label" parent="Control"]
+[node name="Label_MousePosition" type="Label" parent="Control/Labels"]
 minimum_size = Vector2(190, 0)
-anchor_left = 1.0
-anchor_right = 1.0
-offset_left = -205.0
-offset_top = 236.0
-offset_right = -15.0
-offset_bottom = 262.0
+offset_top = 108.0
+offset_right = 190.0
+offset_bottom = 134.0
 grow_horizontal = 0
 size_flags_horizontal = 2
 size_flags_vertical = 0
@@ -222,14 +252,11 @@ text = "Mouse Position:"
 metadata/_edit_layout_mode = 1
 metadata/_edit_use_custom_anchors = false
 
-[node name="Label_Screen_Count" type="Label" parent="Control"]
+[node name="Label_Screen_Count" type="Label" parent="Control/Labels"]
 minimum_size = Vector2(190, 0)
-anchor_left = 1.0
-anchor_right = 1.0
-offset_left = -205.0
-offset_top = 316.0
-offset_right = -15.0
-offset_bottom = 342.0
+offset_top = 144.0
+offset_right = 190.0
+offset_bottom = 170.0
 grow_horizontal = 0
 size_flags_horizontal = 2
 size_flags_vertical = 0
@@ -237,14 +264,11 @@ text = "Screen_Count:"
 metadata/_edit_layout_mode = 1
 metadata/_edit_use_custom_anchors = false
 
-[node name="Label_Screen_Current" type="Label" parent="Control"]
+[node name="Label_Screen_Current" type="Label" parent="Control/Labels"]
 minimum_size = Vector2(190, 0)
-anchor_left = 1.0
-anchor_right = 1.0
-offset_left = -205.0
-offset_top = 36.0
-offset_right = -15.0
-offset_bottom = 62.0
+offset_top = 180.0
+offset_right = 190.0
+offset_bottom = 206.0
 grow_horizontal = 0
 size_flags_horizontal = 2
 size_flags_vertical = 0
@@ -252,14 +276,11 @@ text = "Screen:"
 metadata/_edit_layout_mode = 1
 metadata/_edit_use_custom_anchors = false
 
-[node name="Label_Screen0_Resolution" type="Label" parent="Control"]
+[node name="Label_Screen0_Resolution" type="Label" parent="Control/Labels"]
 minimum_size = Vector2(190, 0)
-anchor_left = 1.0
-anchor_right = 1.0
-offset_left = -205.0
-offset_top = 356.0
-offset_right = -15.0
-offset_bottom = 382.0
+offset_top = 216.0
+offset_right = 190.0
+offset_bottom = 242.0
 grow_horizontal = 0
 size_flags_horizontal = 2
 size_flags_vertical = 0
@@ -267,14 +288,11 @@ text = "Screen0 Resolution: "
 metadata/_edit_layout_mode = 1
 metadata/_edit_use_custom_anchors = false
 
-[node name="Label_Screen0_Position" type="Label" parent="Control"]
+[node name="Label_Screen0_Position" type="Label" parent="Control/Labels"]
 minimum_size = Vector2(190, 0)
-anchor_left = 1.0
-anchor_right = 1.0
-offset_left = -205.0
-offset_top = 396.0
-offset_right = -15.0
-offset_bottom = 422.0
+offset_top = 252.0
+offset_right = 190.0
+offset_bottom = 278.0
 grow_horizontal = 0
 size_flags_horizontal = 2
 size_flags_vertical = 0
@@ -282,14 +300,11 @@ text = "Screen0 Position: "
 metadata/_edit_layout_mode = 1
 metadata/_edit_use_custom_anchors = false
 
-[node name="Label_Screen0_DPI" type="Label" parent="Control"]
+[node name="Label_Screen0_DPI" type="Label" parent="Control/Labels"]
 minimum_size = Vector2(190, 0)
-anchor_left = 1.0
-anchor_right = 1.0
-offset_left = -205.0
-offset_top = 432.0
-offset_right = -15.0
-offset_bottom = 458.0
+offset_top = 288.0
+offset_right = 190.0
+offset_bottom = 314.0
 grow_horizontal = 0
 size_flags_horizontal = 2
 size_flags_vertical = 0
@@ -297,14 +312,11 @@ text = "Screen0 DPI:"
 metadata/_edit_layout_mode = 1
 metadata/_edit_use_custom_anchors = false
 
-[node name="Label_Screen1_Resolution" type="Label" parent="Control"]
+[node name="Label_Screen1_Resolution" type="Label" parent="Control/Labels"]
 minimum_size = Vector2(190, 0)
-anchor_left = 1.0
-anchor_right = 1.0
-offset_left = -205.0
-offset_top = 467.0
-offset_right = -15.0
-offset_bottom = 493.0
+offset_top = 324.0
+offset_right = 190.0
+offset_bottom = 350.0
 grow_horizontal = 0
 size_flags_horizontal = 2
 size_flags_vertical = 0
@@ -312,14 +324,11 @@ text = "Screen1 Resolution: "
 metadata/_edit_layout_mode = 1
 metadata/_edit_use_custom_anchors = false
 
-[node name="Label_Screen1_Position" type="Label" parent="Control"]
+[node name="Label_Screen1_Position" type="Label" parent="Control/Labels"]
 minimum_size = Vector2(190, 0)
-anchor_left = 1.0
-anchor_right = 1.0
-offset_left = -205.0
-offset_top = 505.0
-offset_right = -15.0
-offset_bottom = 531.0
+offset_top = 360.0
+offset_right = 190.0
+offset_bottom = 386.0
 grow_horizontal = 0
 size_flags_horizontal = 2
 size_flags_vertical = 0
@@ -327,14 +336,11 @@ text = "Screen1 Position: "
 metadata/_edit_layout_mode = 1
 metadata/_edit_use_custom_anchors = false
 
-[node name="Label_Screen1_DPI" type="Label" parent="Control"]
+[node name="Label_Screen1_DPI" type="Label" parent="Control/Labels"]
 minimum_size = Vector2(190, 0)
-anchor_left = 1.0
-anchor_right = 1.0
-offset_left = -205.0
-offset_top = 540.0
-offset_right = -15.0
-offset_bottom = 566.0
+offset_top = 396.0
+offset_right = 190.0
+offset_bottom = 422.0
 grow_horizontal = 0
 size_flags_horizontal = 2
 size_flags_vertical = 0
@@ -342,52 +348,6 @@ text = "Screen1 DPI:"
 metadata/_edit_layout_mode = 1
 metadata/_edit_use_custom_anchors = false
 
-[node name="Label_KeyInfo" type="Label" parent="Control"]
-anchor_top = 1.0
-anchor_bottom = 1.0
-offset_left = 14.0
-offset_top = -87.0
-offset_right = 309.0
-offset_bottom = -9.0
-grow_vertical = 0
-size_flags_horizontal = 2
-size_flags_vertical = 0
-text = "F1: Activate MOUSE_MODE_VISIBLE
-F2: Activate MOUSE_MODE_HIDDEN
-F3: Activate MOUSE_MODE_CAPTURED"
-metadata/_edit_layout_mode = 1
-metadata/_edit_use_custom_anchors = false
-
-[node name="Label_MouseModeCaptured_KeyInfo" type="Label" parent="Control"]
-anchor_top = 1.0
-anchor_bottom = 1.0
-offset_left = 328.0
-offset_top = -86.0
-offset_right = 653.0
-offset_bottom = -8.0
-grow_vertical = 0
-size_flags_horizontal = 2
-size_flags_vertical = 0
-text = "ESC: Deactivate MOUSE_MODE_CAPTURED
-W, S: Move forward, backward
-A, D: Strafe left, right"
-metadata/_edit_layout_mode = 1
-metadata/_edit_use_custom_anchors = false
-
-[node name="Label_MouseModes" type="Label" parent="Control"]
-anchor_top = 1.0
-anchor_bottom = 1.0
-offset_left = 18.0
-offset_top = -244.0
-offset_right = 284.0
-offset_bottom = -218.0
-grow_vertical = 0
-size_flags_horizontal = 2
-size_flags_vertical = 0
-text = "MouseModes:"
-metadata/_edit_layout_mode = 1
-metadata/_edit_use_custom_anchors = false
-
 [node name="ImplementationDialog" type="AcceptDialog" parent="Control"]
 
 [node name="Text" type="Label" parent="Control/ImplementationDialog"]
@@ -405,14 +365,14 @@ across platforms.
 Your platform lacks at the moment the following methods:
 "
 
-[connection signal="pressed" from="Control/Button_Fullscreen" to="Control" method="_on_Button_Fullscreen_pressed"]
-[connection signal="pressed" from="Control/Button_FixedSize" to="Control" method="_on_Button_FixedSize_pressed"]
-[connection signal="pressed" from="Control/Button_Minimized" to="Control" method="_on_Button_Minimized_pressed"]
-[connection signal="pressed" from="Control/Button_Maximized" to="Control" method="_on_Button_Maximized_pressed"]
-[connection signal="pressed" from="Control/Button_MoveTo" to="Control" method="_on_Button_MoveTo_pressed"]
-[connection signal="pressed" from="Control/Button_Resize" to="Control" method="_on_Button_Resize_pressed"]
-[connection signal="pressed" from="Control/Button_Screen0" to="Control" method="_on_Button_Screen0_pressed"]
-[connection signal="pressed" from="Control/Button_Screen1" to="Control" method="_on_Button_Screen1_pressed"]
-[connection signal="pressed" from="Control/Button_MouseModeVisible" to="Control" method="_on_Button_MouseModeVisible_pressed"]
-[connection signal="pressed" from="Control/Button_MouseModeHidden" to="Control" method="_on_Button_MouseModeHidden_pressed"]
-[connection signal="pressed" from="Control/Button_MouseModeCaptured" to="Control" method="_on_Button_MouseModeCaptured_pressed"]
+[connection signal="pressed" from="Control/Buttons/Button_Fullscreen" to="Control" method="_on_Button_Fullscreen_pressed"]
+[connection signal="pressed" from="Control/Buttons/Button_FixedSize" to="Control" method="_on_Button_FixedSize_pressed"]
+[connection signal="pressed" from="Control/Buttons/Button_Minimized" to="Control" method="_on_Button_Minimized_pressed"]
+[connection signal="pressed" from="Control/Buttons/Button_Maximized" to="Control" method="_on_Button_Maximized_pressed"]
+[connection signal="pressed" from="Control/Buttons/Button_MoveTo" to="Control" method="_on_Button_MoveTo_pressed"]
+[connection signal="pressed" from="Control/Buttons/Button_Resize" to="Control" method="_on_Button_Resize_pressed"]
+[connection signal="pressed" from="Control/Buttons/Button_Screen0" to="Control" method="_on_Button_Screen0_pressed"]
+[connection signal="pressed" from="Control/Buttons/Button_Screen1" to="Control" method="_on_Button_Screen1_pressed"]
+[connection signal="pressed" from="Control/Buttons/Button_MouseModeVisible" to="Control" method="_on_Button_MouseModeVisible_pressed"]
+[connection signal="pressed" from="Control/Buttons/Button_MouseModeHidden" to="Control" method="_on_Button_MouseModeHidden_pressed"]
+[connection signal="pressed" from="Control/Buttons/Button_MouseModeCaptured" to="Control" method="_on_Button_MouseModeCaptured_pressed"]