Make VoxelSet Editor's PopupDialogs to WindowDialogs

PauloVBettio · Dec 27, 2021 · 667b84d · 667b84d
1 parent 156ed7d
commit 667b84d
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 9 deletions.
diff --git a/addons/voxel-core/controls/voxel_viewer/voxel_viewer.gd b/addons/voxel-core/controls/voxel_viewer/voxel_viewer.gd
@@ -463,10 +463,13 @@ func show_context_menu(global_position : Vector2, face := _last_hovered_face) ->
 func show_color_menu(color : Color) -> void:
 	if is_instance_valid(ColorMenu):
 		VoxelColor.color = color
-		ColorMenu.popup_centered()
+		ColorMenu.show()
 		ColorMenu.set_as_minsize()
 		ColorMenu.rect_size += Vector2(32, 32)
 		ColorMenu.rect_min_size = ColorMenu.rect_size
+
+		ColorMenu.set_position(
+				(get_viewport_rect().size / 2) - (ColorMenu.rect_min_size / 2))
 
 
 # Closes the color menu
@@ -481,10 +484,13 @@ func show_texture_menu(uv : Vector2) -> void:
 	if is_instance_valid(TextureMenu):
 		VoxelTexture.unselect_all()
 		VoxelTexture.select(uv)
-		TextureMenu.popup_centered()
+		TextureMenu.show()
 		TextureMenu.set_as_minsize()
 		TextureMenu.rect_size += Vector2(32, 32)
 		TextureMenu.rect_min_size = TextureMenu.rect_size
+
+		TextureMenu.set_position(
+				(get_viewport_rect().size / 2) - (TextureMenu.rect_min_size / 2))
 
 
 # Closes the texture menu
@@ -504,10 +510,14 @@ func show_material_menu(voxel := get_viewing_voxel()) -> void:
 		Roughness.value = Voxel.get_roughness(voxel)
 		Energy.value = Voxel.get_energy(voxel)
 		EnergyColor.color = Voxel.get_energy_color(voxel)
-		MaterialMenu.popup_centered()
+
+		MaterialMenu.show()
 		MaterialMenu.set_as_minsize()
 		MaterialMenu.rect_size += Vector2(32, 32)
 		MaterialMenu.rect_min_size = MaterialMenu.rect_size
+
+		MaterialMenu.set_position(
+				(get_viewport_rect().size / 2) - (MaterialMenu.rect_min_size / 2))
 
 
 # Closes the material menu

diff --git a/addons/voxel-core/controls/voxel_viewer/voxel_viewer.tscn b/addons/voxel-core/controls/voxel_viewer/voxel_viewer.tscn
@@ -169,10 +169,13 @@ __meta__ = {
 "_edit_use_anchors_": true
 }
 
-[node name="ColorMenu" type="PopupDialog" parent="."]
+[node name="ColorMenu" type="WindowDialog" parent="."]
+visible = true
 margin_right = 359.0
 margin_bottom = 495.0
 popup_exclusive = true
+window_title = "Color Picker"
+resizable = true
 __meta__ = {
 "_edit_use_anchors_": false
 }
@@ -220,11 +223,13 @@ margin_bottom = 20.0
 size_flags_horizontal = 3
 text = "Confirm"
 
-[node name="TextureMenu" type="PopupDialog" parent="."]
+[node name="TextureMenu" type="WindowDialog" parent="."]
 margin_right = 324.0
 margin_bottom = 260.0
 rect_min_size = Vector2( 324, 260 )
 popup_exclusive = true
+window_title = "Texture Picker"
+resizable = true
 
 [node name="VBoxContainer" type="VBoxContainer" parent="TextureMenu"]
 anchor_left = 0.0246914
@@ -268,16 +273,15 @@ margin_bottom = 20.0
 size_flags_horizontal = 3
 text = "Confirm"
 
-[node name="MaterialMenu" type="PopupDialog" parent="."]
+[node name="MaterialMenu" type="WindowDialog" parent="."]
 margin_right = 250.0
 margin_bottom = 325.0
 rect_min_size = Vector2( 250, 325 )
 size_flags_horizontal = 0
 size_flags_vertical = 0
 popup_exclusive = true
-__meta__ = {
-"_edit_use_anchors_": false
-}
+window_title = "Material Picker"
+resizable = true
 
 [node name="VBoxContainer" type="VBoxContainer" parent="MaterialMenu"]
 anchor_left = 0.032