diff --git a/src/Tools/BaseDraw.tscn b/src/Tools/BaseDraw.tscn index cb625adcb71..69eedb916ad 100644 --- a/src/Tools/BaseDraw.tscn +++ b/src/Tools/BaseDraw.tscn @@ -98,7 +98,7 @@ layout_mode = 0 offset_right = 32.0 offset_bottom = 32.0 expand_mode = 1 -stretch_mode = 6 +stretch_mode = 5 [node name="BrushSize" parent="Brush" index="1" instance=ExtResource("1")] layout_mode = 2 diff --git a/src/Tools/DesignTools/Bucket.tscn b/src/Tools/DesignTools/Bucket.tscn index 17ed602d7b1..871cac243ad 100644 --- a/src/Tools/DesignTools/Bucket.tscn +++ b/src/Tools/DesignTools/Bucket.tscn @@ -100,7 +100,7 @@ layout_mode = 0 offset_right = 32.0 offset_bottom = 32.0 expand_mode = 1 -stretch_mode = 6 +stretch_mode = 5 [node name="OffsetX" parent="FillPattern" index="1" instance=ExtResource("1")] layout_mode = 2 diff --git a/src/Tools/SelectionTools/PaintSelect.tscn b/src/Tools/SelectionTools/PaintSelect.tscn index 0661e653e44..6d23a8ea255 100644 --- a/src/Tools/SelectionTools/PaintSelect.tscn +++ b/src/Tools/SelectionTools/PaintSelect.tscn @@ -46,7 +46,7 @@ layout_mode = 0 offset_right = 32.0 offset_bottom = 32.0 expand_mode = 1 -stretch_mode = 6 +stretch_mode = 5 [node name="BrushSize" parent="Brush" index="1" instance=ExtResource("3")] layout_mode = 2 diff --git a/src/UI/Buttons/BrushButton.tscn b/src/UI/Buttons/BrushButton.tscn index 0b278e1be2f..5e9ea796a68 100644 --- a/src/UI/Buttons/BrushButton.tscn +++ b/src/UI/Buttons/BrushButton.tscn @@ -21,7 +21,7 @@ offset_right = -2.0 offset_bottom = -2.0 pivot_offset = Vector2(16, 16) expand_mode = 1 -stretch_mode = 6 +stretch_mode = 5 [node name="TransparentChecker" parent="BrushTexture" instance=ExtResource("1")] show_behind_parent = true diff --git a/src/UI/Buttons/PatternButton.tscn b/src/UI/Buttons/PatternButton.tscn index 5b3550209fd..e63ca0cd83d 100644 --- a/src/UI/Buttons/PatternButton.tscn +++ b/src/UI/Buttons/PatternButton.tscn @@ -1,19 +1,19 @@ -[gd_scene load_steps=4 format=2] +[gd_scene load_steps=4 format=3 uid="uid://bx6xntkb2tstx"] -[ext_resource path="res://src/UI/Buttons/PatternButton.gd" type="Script" id=2] +[ext_resource type="Script" path="res://src/UI/Buttons/PatternButton.gd" id="2"] -[sub_resource type="StyleBoxFlat" id=2] -bg_color = Color( 1, 1, 1, 1 ) -border_color = Color( 1, 1, 1, 1 ) +[sub_resource type="StyleBoxFlat" id="1"] +bg_color = Color(1, 1, 1, 1) +border_color = Color(1, 1, 1, 1) corner_radius_top_left = 5 corner_radius_top_right = 5 corner_radius_bottom_right = 5 corner_radius_bottom_left = 5 anti_aliasing = false -[sub_resource type="StyleBoxFlat" id=1] -bg_color = Color( 1, 1, 1, 1 ) -border_color = Color( 1, 1, 1, 1 ) +[sub_resource type="StyleBoxFlat" id="2"] +bg_color = Color(1, 1, 1, 1) +border_color = Color(1, 1, 1, 1) corner_radius_top_left = 5 corner_radius_top_right = 5 corner_radius_bottom_right = 5 @@ -21,25 +21,23 @@ corner_radius_bottom_left = 5 anti_aliasing = false [node name="PatternButton" type="Button"] +custom_minimum_size = Vector2(32, 32) offset_right = 32.0 offset_bottom = 32.0 -custom_minimum_size = Vector2( 32, 32 ) -theme_override_styles/hover = SubResource( 2 ) -theme_override_styles/pressed = SubResource( 2 ) -theme_override_styles/focus = SubResource( 1 ) -theme_override_styles/disabled = SubResource( 1 ) -theme_override_styles/normal = SubResource( 2 ) +theme_override_styles/focus = SubResource("1") +theme_override_styles/disabled = SubResource("1") +theme_override_styles/hover = SubResource("2") +theme_override_styles/pressed = SubResource("2") +theme_override_styles/normal = SubResource("2") button_mask = 7 -script = ExtResource( 2 ) +script = ExtResource("2") [node name="PatternTexture" type="TextureRect" parent="."] +custom_minimum_size = Vector2(32, 32) +layout_mode = 0 offset_right = 32.0 offset_bottom = 32.0 -custom_minimum_size = Vector2( 32, 32 ) -expand = true -stretch_mode = 6 -__meta__ = { -"_edit_use_anchors_": false -} +expand_mode = 1 +stretch_mode = 5 [connection signal="pressed" from="." to="." method="_on_PatternButton_pressed"] diff --git a/src/UI/Dialogs/ExportDialog.gd b/src/UI/Dialogs/ExportDialog.gd index ff09416ad8e..9db80b27ddf 100644 --- a/src/UI/Dialogs/ExportDialog.gd +++ b/src/UI/Dialogs/ExportDialog.gd @@ -163,6 +163,7 @@ func create_preview_container() -> VBoxContainer: func create_preview_rect() -> TextureRect: var preview := TextureRect.new() + preview.expand_mode = TextureRect.EXPAND_IGNORE_SIZE preview.size_flags_horizontal = Control.SIZE_EXPAND_FILL preview.size_flags_vertical = Control.SIZE_EXPAND_FILL preview.stretch_mode = TextureRect.STRETCH_KEEP_ASPECT_CENTERED diff --git a/src/UI/Dialogs/ImageEffects/ImageEffectParent.tscn b/src/UI/Dialogs/ImageEffects/ImageEffectParent.tscn index 773962b9048..b60399b0df5 100644 --- a/src/UI/Dialogs/ImageEffects/ImageEffectParent.tscn +++ b/src/UI/Dialogs/ImageEffects/ImageEffectParent.tscn @@ -35,7 +35,7 @@ grow_horizontal = 2 grow_vertical = 2 texture = ExtResource("4") expand_mode = 1 -stretch_mode = 6 +stretch_mode = 5 [node name="AspectRatioContainer" type="AspectRatioContainer" parent="VBoxContainer"] layout_mode = 2 @@ -45,7 +45,7 @@ size_flags_vertical = 3 custom_minimum_size = Vector2(200, 200) layout_mode = 2 expand_mode = 1 -stretch_mode = 5 +stretch_mode = 4 [node name="TransparentChecker" parent="VBoxContainer/AspectRatioContainer/Preview" instance=ExtResource("2")] show_behind_parent = true diff --git a/src/UI/Dialogs/ImageEffects/ResizeCanvas.tscn b/src/UI/Dialogs/ImageEffects/ResizeCanvas.tscn index 234da38972e..ab8db99e792 100644 --- a/src/UI/Dialogs/ImageEffects/ResizeCanvas.tscn +++ b/src/UI/Dialogs/ImageEffects/ResizeCanvas.tscn @@ -101,12 +101,9 @@ layout_mode = 2 expand_mode = 1 stretch_mode = 5 -[node name="TransparentChecker" parent="VBoxContainer/AspectRatioContainer/Preview" instance=ExtResource("1")] +[node name="TransparentChecker" parent="VBoxContainer/AspectRatioContainer" instance=ExtResource("1")] show_behind_parent = true -layout_mode = 0 -anchors_preset = 0 -anchor_right = 1.0 -anchor_bottom = 1.0 +layout_mode = 2 [connection signal="about_to_popup" from="." to="." method="_on_ResizeCanvas_about_to_show"] [connection signal="confirmed" from="." to="." method="_on_ResizeCanvas_confirmed"] diff --git a/src/UI/Dialogs/ImageEffects/ShaderEffect.tscn b/src/UI/Dialogs/ImageEffects/ShaderEffect.tscn index e33f98a41ba..037559f8700 100644 --- a/src/UI/Dialogs/ImageEffects/ShaderEffect.tscn +++ b/src/UI/Dialogs/ImageEffects/ShaderEffect.tscn @@ -30,7 +30,7 @@ material = SubResource("1") custom_minimum_size = Vector2(200, 200) layout_mode = 2 expand_mode = 1 -stretch_mode = 5 +stretch_mode = 4 [node name="TransparentChecker" parent="VBoxContainer/AspectRatioContainer/Preview" instance=ExtResource("2")] show_behind_parent = true diff --git a/src/UI/Recorder/Recorder.tscn b/src/UI/Recorder/Recorder.tscn index 717cc742fce..050d8af9ced 100644 --- a/src/UI/Recorder/Recorder.tscn +++ b/src/UI/Recorder/Recorder.tscn @@ -58,7 +58,7 @@ offset_right = 10.0 offset_bottom = 10.5 texture = ExtResource("1") expand_mode = 1 -stretch_mode = 6 +stretch_mode = 5 [node name="Settings" type="Button" parent="ScrollContainer/CenterContainer/GridContainer" groups=["UIButtons"]] unique_name_in_owner = true @@ -79,7 +79,7 @@ offset_top = -10.5 offset_right = 10.0 offset_bottom = 10.5 texture = ExtResource("3") -stretch_mode = 6 +stretch_mode = 5 [node name="OpenFolder" type="Button" parent="ScrollContainer/CenterContainer/GridContainer"] custom_minimum_size = Vector2(32, 32) @@ -97,7 +97,7 @@ offset_top = 3.0 offset_right = -3.0 offset_bottom = -3.0 texture = ExtResource("4") -stretch_mode = 6 +stretch_mode = 5 [node name="OptionsDialog" type="AcceptDialog" parent="."] position = Vector2i(0, 36)