diff --git a/src/UI/Dialogs/ImageEffects/DesaturateDialog.gd b/src/UI/Dialogs/ImageEffects/DesaturateDialog.gd index 7fd14cac6..eeca74b72 100644 --- a/src/UI/Dialogs/ImageEffects/DesaturateDialog.gd +++ b/src/UI/Dialogs/ImageEffects/DesaturateDialog.gd @@ -17,7 +17,7 @@ func _about_to_show(): func set_nodes() -> void: - preview = $VBoxContainer/Preview + preview = $VBoxContainer/AspectRatioContainer/Preview selection_checkbox = $VBoxContainer/OptionsContainer/SelectionCheckBox affect_option_button = $VBoxContainer/OptionsContainer/AffectOptionButton diff --git a/src/UI/Dialogs/ImageEffects/DesaturateDialog.tscn b/src/UI/Dialogs/ImageEffects/DesaturateDialog.tscn index 35955fa1d..c5aff0e27 100644 --- a/src/UI/Dialogs/ImageEffects/DesaturateDialog.tscn +++ b/src/UI/Dialogs/ImageEffects/DesaturateDialog.tscn @@ -4,43 +4,54 @@ [ext_resource path="res://src/UI/TransparentChecker.tscn" type="PackedScene" id=2] [node name="DesaturateDialog" type="ConfirmationDialog"] -margin_right = 200.0 -margin_bottom = 70.0 +margin_right = 294.0 +margin_bottom = 296.0 +rect_min_size = Vector2( 172, 60.2 ) window_title = "Desaturation" resizable = true script = ExtResource( 1 ) +__meta__ = { +"_edit_use_anchors_": false +} [node name="VBoxContainer" type="VBoxContainer" parent="."] margin_left = 8.0 margin_top = 8.0 -margin_right = 271.0 +margin_right = 286.0 margin_bottom = 260.0 __meta__ = { "_edit_use_anchors_": false } -[node name="Preview" type="TextureRect" parent="VBoxContainer"] -margin_left = 31.0 -margin_right = 231.0 +[node name="AspectRatioContainer" type="AspectRatioContainer" parent="VBoxContainer"] +margin_right = 278.0 +margin_bottom = 200.0 +size_flags_vertical = 3 + +[node name="Preview" type="TextureRect" parent="VBoxContainer/AspectRatioContainer"] +margin_left = 39.0 +margin_right = 239.0 margin_bottom = 200.0 rect_min_size = Vector2( 200, 200 ) -size_flags_horizontal = 4 -size_flags_vertical = 3 expand = true stretch_mode = 5 -[node name="TransparentChecker" parent="VBoxContainer/Preview" instance=ExtResource( 2 )] +[node name="TransparentChecker" parent="VBoxContainer/AspectRatioContainer/Preview" instance=ExtResource( 2 )] show_behind_parent = true +anchor_right = 1.0 +anchor_bottom = 1.0 +margin_right = 0.0 +margin_bottom = 0.0 [node name="RGBAContainer" type="HBoxContainer" parent="VBoxContainer"] margin_top = 204.0 -margin_right = 263.0 +margin_right = 278.0 margin_bottom = 224.0 alignment = 1 [node name="RButton" type="Button" parent="VBoxContainer/RGBAContainer"] -margin_left = 83.0 -margin_right = 103.0 +margin_left = 91.0 +margin_right = 111.0 margin_bottom = 20.0 hint_tooltip = "Modify Red Channel" mouse_default_cursor_shape = 2 @@ -49,8 +60,8 @@ pressed = true text = "R" [node name="GButton" type="Button" parent="VBoxContainer/RGBAContainer"] -margin_left = 107.0 -margin_right = 129.0 +margin_left = 115.0 +margin_right = 137.0 margin_bottom = 20.0 hint_tooltip = "Modify Green Channel" mouse_default_cursor_shape = 2 @@ -59,8 +70,8 @@ pressed = true text = "G" [node name="BButton" type="Button" parent="VBoxContainer/RGBAContainer"] -margin_left = 133.0 -margin_right = 154.0 +margin_left = 141.0 +margin_right = 162.0 margin_bottom = 20.0 hint_tooltip = "Modify Blue Channel" mouse_default_cursor_shape = 2 @@ -69,8 +80,8 @@ pressed = true text = "B" [node name="AButton" type="Button" parent="VBoxContainer/RGBAContainer"] -margin_left = 158.0 -margin_right = 179.0 +margin_left = 166.0 +margin_right = 187.0 margin_bottom = 20.0 hint_tooltip = "Modify Alpha Channel" mouse_default_cursor_shape = 2 @@ -79,7 +90,7 @@ text = "A" [node name="OptionsContainer" type="HBoxContainer" parent="VBoxContainer"] margin_top = 228.0 -margin_right = 263.0 +margin_right = 278.0 margin_bottom = 252.0 [node name="SelectionCheckBox" type="CheckBox" parent="VBoxContainer/OptionsContainer"] @@ -91,7 +102,7 @@ text = "Only affect selection" [node name="AffectOptionButton" type="OptionButton" parent="VBoxContainer/OptionsContainer"] margin_left = 164.0 -margin_right = 263.0 +margin_right = 278.0 margin_bottom = 24.0 mouse_default_cursor_shape = 2 text = "Selected cels" diff --git a/src/UI/Dialogs/ImageEffects/FlipImageDialog.gd b/src/UI/Dialogs/ImageEffects/FlipImageDialog.gd index 5a044319e..83b9b94f7 100644 --- a/src/UI/Dialogs/ImageEffects/FlipImageDialog.gd +++ b/src/UI/Dialogs/ImageEffects/FlipImageDialog.gd @@ -6,7 +6,7 @@ onready var flip_v : CheckBox = $VBoxContainer/OptionsContainer/FlipVertical func set_nodes() -> void: - preview = $VBoxContainer/Preview + preview = $VBoxContainer/AspectRatioContainer/Preview selection_checkbox = $VBoxContainer/OptionsContainer/SelectionCheckBox affect_option_button = $VBoxContainer/OptionsContainer/AffectOptionButton diff --git a/src/UI/Dialogs/ImageEffects/FlipImageDialog.tscn b/src/UI/Dialogs/ImageEffects/FlipImageDialog.tscn index c004454f9..581bad770 100644 --- a/src/UI/Dialogs/ImageEffects/FlipImageDialog.tscn +++ b/src/UI/Dialogs/ImageEffects/FlipImageDialog.tscn @@ -6,6 +6,7 @@ [node name="FlipImageDialog" type="ConfirmationDialog"] margin_right = 283.0 margin_bottom = 300.0 +rect_min_size = Vector2( 172, 60.2 ) window_title = "Flip" resizable = true script = ExtResource( 1 ) @@ -13,28 +14,35 @@ script = ExtResource( 1 ) [node name="VBoxContainer" type="VBoxContainer" parent="."] margin_left = 8.0 margin_top = 8.0 -margin_right = 275.0 +margin_right = 286.0 margin_bottom = 264.0 __meta__ = { "_edit_use_anchors_": false } -[node name="Preview" type="TextureRect" parent="VBoxContainer"] -margin_left = 33.0 -margin_right = 233.0 +[node name="AspectRatioContainer" type="AspectRatioContainer" parent="VBoxContainer"] +margin_right = 278.0 +margin_bottom = 200.0 +size_flags_vertical = 3 + +[node name="Preview" type="TextureRect" parent="VBoxContainer/AspectRatioContainer"] +margin_left = 39.0 +margin_right = 239.0 margin_bottom = 200.0 rect_min_size = Vector2( 200, 200 ) -size_flags_horizontal = 4 -size_flags_vertical = 3 expand = true stretch_mode = 5 -[node name="TransparentChecker" parent="VBoxContainer/Preview" instance=ExtResource( 2 )] +[node name="TransparentChecker" parent="VBoxContainer/AspectRatioContainer/Preview" instance=ExtResource( 2 )] show_behind_parent = true +anchor_right = 1.0 +anchor_bottom = 1.0 +margin_right = 0.0 +margin_bottom = 0.0 [node name="OptionsContainer" type="GridContainer" parent="VBoxContainer"] margin_top = 204.0 -margin_right = 267.0 +margin_right = 278.0 margin_bottom = 256.0 columns = 2 @@ -46,7 +54,7 @@ text = "Flip Horizontal" [node name="FlipVertical" type="CheckBox" parent="VBoxContainer/OptionsContainer"] margin_left = 164.0 -margin_right = 267.0 +margin_right = 278.0 margin_bottom = 24.0 mouse_default_cursor_shape = 2 text = "Flip Vertical" @@ -62,7 +70,7 @@ text = "Only affect selection" [node name="AffectOptionButton" type="OptionButton" parent="VBoxContainer/OptionsContainer"] margin_left = 164.0 margin_top = 28.0 -margin_right = 267.0 +margin_right = 278.0 margin_bottom = 52.0 mouse_default_cursor_shape = 2 text = "Selected cels" diff --git a/src/UI/Dialogs/ImageEffects/GradientDialog.gd b/src/UI/Dialogs/ImageEffects/GradientDialog.gd index 83091075d..4213b94cc 100644 --- a/src/UI/Dialogs/ImageEffects/GradientDialog.gd +++ b/src/UI/Dialogs/ImageEffects/GradientDialog.gd @@ -13,7 +13,7 @@ func _ready() -> void: func set_nodes() -> void: - preview = $VBoxContainer/Preview + preview = $VBoxContainer/AspectRatioContainer/Preview selection_checkbox = $VBoxContainer/OptionsContainer/SelectionCheckBox affect_option_button = $VBoxContainer/OptionsContainer/AffectOptionButton diff --git a/src/UI/Dialogs/ImageEffects/GradientDialog.tscn b/src/UI/Dialogs/ImageEffects/GradientDialog.tscn index 5ae0b9ddf..1d1f6bba1 100644 --- a/src/UI/Dialogs/ImageEffects/GradientDialog.tscn +++ b/src/UI/Dialogs/ImageEffects/GradientDialog.tscn @@ -6,6 +6,7 @@ [node name="GradientDialog" type="ConfirmationDialog"] margin_right = 200.0 margin_bottom = 196.0 +rect_min_size = Vector2( 172, 60.2 ) window_title = "Gradient" resizable = true script = ExtResource( 1 ) @@ -24,18 +25,27 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="Preview" type="TextureRect" parent="VBoxContainer"] -margin_left = 42.0 -margin_right = 242.0 +[node name="AspectRatioContainer" type="AspectRatioContainer" parent="VBoxContainer"] +margin_right = 285.0 +margin_bottom = 200.0 +size_flags_vertical = 3 + +[node name="Preview" type="TextureRect" parent="VBoxContainer/AspectRatioContainer"] +margin_left = 42.5 +margin_right = 242.5 margin_bottom = 200.0 rect_min_size = Vector2( 200, 200 ) -size_flags_horizontal = 4 +size_flags_horizontal = 5 size_flags_vertical = 3 expand = true stretch_mode = 5 -[node name="TransparentChecker" parent="VBoxContainer/Preview" instance=ExtResource( 2 )] +[node name="TransparentChecker" parent="VBoxContainer/AspectRatioContainer/Preview" instance=ExtResource( 2 )] show_behind_parent = true +anchor_right = 1.0 +anchor_bottom = 1.0 +margin_right = 0.0 +margin_bottom = 0.0 [node name="OptionsContainer" type="GridContainer" parent="VBoxContainer"] margin_top = 204.0 diff --git a/src/UI/Dialogs/ImageEffects/HSVDialog.gd b/src/UI/Dialogs/ImageEffects/HSVDialog.gd index f6aec1e00..6c2a3b6d7 100644 --- a/src/UI/Dialogs/ImageEffects/HSVDialog.gd +++ b/src/UI/Dialogs/ImageEffects/HSVDialog.gd @@ -21,7 +21,7 @@ func _about_to_show(): func set_nodes() -> void: - preview = $VBoxContainer/Preview + preview = $VBoxContainer/AspectRatioContainer/Preview selection_checkbox = $VBoxContainer/AffectHBoxContainer/SelectionCheckBox affect_option_button = $VBoxContainer/AffectHBoxContainer/AffectOptionButton diff --git a/src/UI/Dialogs/ImageEffects/HSVDialog.tscn b/src/UI/Dialogs/ImageEffects/HSVDialog.tscn index 29dcd9eae..ae50e5ebc 100644 --- a/src/UI/Dialogs/ImageEffects/HSVDialog.tscn +++ b/src/UI/Dialogs/ImageEffects/HSVDialog.tscn @@ -8,6 +8,7 @@ margin_left = 1.0 margin_top = -1.0 margin_right = 464.0 margin_bottom = 318.0 +rect_min_size = Vector2( 172, 60.2 ) window_title = "Adjust HSV" resizable = true script = ExtResource( 1 ) @@ -21,18 +22,25 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="Preview" type="TextureRect" parent="VBoxContainer"] -margin_left = 123.0 -margin_right = 323.0 +[node name="AspectRatioContainer" type="AspectRatioContainer" parent="VBoxContainer"] +margin_right = 447.0 +margin_bottom = 200.0 +size_flags_vertical = 3 + +[node name="Preview" type="TextureRect" parent="VBoxContainer/AspectRatioContainer"] +margin_left = 123.5 +margin_right = 323.5 margin_bottom = 200.0 rect_min_size = Vector2( 200, 200 ) -size_flags_horizontal = 4 -size_flags_vertical = 3 expand = true stretch_mode = 5 -[node name="TransparentChecker" parent="VBoxContainer/Preview" instance=ExtResource( 2 )] +[node name="TransparentChecker" parent="VBoxContainer/AspectRatioContainer/Preview" instance=ExtResource( 2 )] show_behind_parent = true +anchor_right = 1.0 +anchor_bottom = 1.0 +margin_right = 0.0 +margin_bottom = 0.0 [node name="HBoxContainer" type="HBoxContainer" parent="VBoxContainer"] margin_top = 204.0 @@ -144,7 +152,7 @@ text = "Only affect selection" [node name="AffectOptionButton" type="OptionButton" parent="VBoxContainer/AffectHBoxContainer"] margin_left = 164.0 -margin_right = 263.0 +margin_right = 278.0 margin_bottom = 24.0 mouse_default_cursor_shape = 2 text = "Selected cels" diff --git a/src/UI/Dialogs/ImageEffects/InvertColorsDialog.gd b/src/UI/Dialogs/ImageEffects/InvertColorsDialog.gd index 5bb335f28..882ab23d1 100644 --- a/src/UI/Dialogs/ImageEffects/InvertColorsDialog.gd +++ b/src/UI/Dialogs/ImageEffects/InvertColorsDialog.gd @@ -16,7 +16,7 @@ func _about_to_show(): ._about_to_show() func set_nodes() -> void: - preview = $VBoxContainer/Preview + preview = $VBoxContainer/AspectRatioContainer/Preview selection_checkbox = $VBoxContainer/OptionsContainer/SelectionCheckBox affect_option_button = $VBoxContainer/OptionsContainer/AffectOptionButton diff --git a/src/UI/Dialogs/ImageEffects/InvertColorsDialog.tscn b/src/UI/Dialogs/ImageEffects/InvertColorsDialog.tscn index 028d00081..124ab5d1e 100644 --- a/src/UI/Dialogs/ImageEffects/InvertColorsDialog.tscn +++ b/src/UI/Dialogs/ImageEffects/InvertColorsDialog.tscn @@ -4,43 +4,54 @@ [ext_resource path="res://src/UI/TransparentChecker.tscn" type="PackedScene" id=2] [node name="InvertColorsDialog" type="ConfirmationDialog"] -margin_right = 200.0 -margin_bottom = 70.0 +margin_right = 294.0 +margin_bottom = 296.0 +rect_min_size = Vector2( 172, 60.2 ) window_title = "Invert Colors" resizable = true script = ExtResource( 1 ) +__meta__ = { +"_edit_use_anchors_": false +} [node name="VBoxContainer" type="VBoxContainer" parent="."] margin_left = 8.0 margin_top = 8.0 -margin_right = 271.0 +margin_right = 286.0 margin_bottom = 260.0 __meta__ = { "_edit_use_anchors_": false } -[node name="Preview" type="TextureRect" parent="VBoxContainer"] -margin_left = 31.0 -margin_right = 231.0 +[node name="AspectRatioContainer" type="AspectRatioContainer" parent="VBoxContainer"] +margin_right = 278.0 +margin_bottom = 200.0 +size_flags_vertical = 3 + +[node name="Preview" type="TextureRect" parent="VBoxContainer/AspectRatioContainer"] +margin_left = 39.0 +margin_right = 239.0 margin_bottom = 200.0 rect_min_size = Vector2( 200, 200 ) -size_flags_horizontal = 4 -size_flags_vertical = 3 expand = true stretch_mode = 5 -[node name="TransparentChecker" parent="VBoxContainer/Preview" instance=ExtResource( 2 )] +[node name="TransparentChecker" parent="VBoxContainer/AspectRatioContainer/Preview" instance=ExtResource( 2 )] show_behind_parent = true +anchor_right = 1.0 +anchor_bottom = 1.0 +margin_right = 0.0 +margin_bottom = 0.0 [node name="RGBAContainer" type="HBoxContainer" parent="VBoxContainer"] margin_top = 204.0 -margin_right = 263.0 +margin_right = 278.0 margin_bottom = 224.0 alignment = 1 [node name="RButton" type="Button" parent="VBoxContainer/RGBAContainer"] -margin_left = 83.0 -margin_right = 103.0 +margin_left = 91.0 +margin_right = 111.0 margin_bottom = 20.0 hint_tooltip = "Modify Red Channel" mouse_default_cursor_shape = 2 @@ -49,8 +60,8 @@ pressed = true text = "R" [node name="GButton" type="Button" parent="VBoxContainer/RGBAContainer"] -margin_left = 107.0 -margin_right = 129.0 +margin_left = 115.0 +margin_right = 137.0 margin_bottom = 20.0 hint_tooltip = "Modify Green Channel" mouse_default_cursor_shape = 2 @@ -59,8 +70,8 @@ pressed = true text = "G" [node name="BButton" type="Button" parent="VBoxContainer/RGBAContainer"] -margin_left = 133.0 -margin_right = 154.0 +margin_left = 141.0 +margin_right = 162.0 margin_bottom = 20.0 hint_tooltip = "Modify Blue Channel" mouse_default_cursor_shape = 2 @@ -69,8 +80,8 @@ pressed = true text = "B" [node name="AButton" type="Button" parent="VBoxContainer/RGBAContainer"] -margin_left = 158.0 -margin_right = 179.0 +margin_left = 166.0 +margin_right = 187.0 margin_bottom = 20.0 hint_tooltip = "Modify Alpha Channel" mouse_default_cursor_shape = 2 @@ -79,7 +90,7 @@ text = "A" [node name="OptionsContainer" type="HBoxContainer" parent="VBoxContainer"] margin_top = 228.0 -margin_right = 263.0 +margin_right = 278.0 margin_bottom = 252.0 [node name="SelectionCheckBox" type="CheckBox" parent="VBoxContainer/OptionsContainer"] @@ -91,7 +102,7 @@ text = "Only affect selection" [node name="AffectOptionButton" type="OptionButton" parent="VBoxContainer/OptionsContainer"] margin_left = 164.0 -margin_right = 263.0 +margin_right = 278.0 margin_bottom = 24.0 mouse_default_cursor_shape = 2 text = "Selected cels" diff --git a/src/UI/Dialogs/ImageEffects/OutlineDialog.gd b/src/UI/Dialogs/ImageEffects/OutlineDialog.gd index 8df287320..d391e519e 100644 --- a/src/UI/Dialogs/ImageEffects/OutlineDialog.gd +++ b/src/UI/Dialogs/ImageEffects/OutlineDialog.gd @@ -15,7 +15,7 @@ func _ready() -> void: func set_nodes() -> void: - preview = $VBoxContainer/Preview + preview = $VBoxContainer/AspectRatioContainer/Preview selection_checkbox = $VBoxContainer/OptionsContainer/SelectionCheckBox affect_option_button = $VBoxContainer/OptionsContainer/AffectOptionButton diff --git a/src/UI/Dialogs/ImageEffects/OutlineDialog.tscn b/src/UI/Dialogs/ImageEffects/OutlineDialog.tscn index 34402292f..a5efec6fe 100644 --- a/src/UI/Dialogs/ImageEffects/OutlineDialog.tscn +++ b/src/UI/Dialogs/ImageEffects/OutlineDialog.tscn @@ -4,8 +4,9 @@ [ext_resource path="res://src/UI/TransparentChecker.tscn" type="PackedScene" id=2] [node name="OutlineDialog" type="ConfirmationDialog"] -margin_right = 200.0 -margin_bottom = 70.0 +margin_right = 543.0 +margin_bottom = 511.0 +rect_min_size = Vector2( 172, 60.2 ) window_title = "Outline" resizable = true script = ExtResource( 1 ) @@ -16,29 +17,36 @@ __meta__ = { [node name="VBoxContainer" type="VBoxContainer" parent="."] margin_left = 8.0 margin_top = 8.0 -margin_right = 320.0 -margin_bottom = 316.0 +margin_right = 535.0 +margin_bottom = 475.0 __meta__ = { "_edit_use_anchors_": false } -[node name="Preview" type="TextureRect" parent="VBoxContainer"] -margin_left = 56.0 -margin_right = 256.0 -margin_bottom = 200.0 -rect_min_size = Vector2( 200, 200 ) -size_flags_horizontal = 4 +[node name="AspectRatioContainer" type="AspectRatioContainer" parent="VBoxContainer"] +margin_right = 527.0 +margin_bottom = 359.0 size_flags_vertical = 3 + +[node name="Preview" type="TextureRect" parent="VBoxContainer/AspectRatioContainer"] +margin_left = 84.0 +margin_right = 443.0 +margin_bottom = 359.0 +rect_min_size = Vector2( 200, 200 ) expand = true stretch_mode = 5 -[node name="TransparentChecker" parent="VBoxContainer/Preview" instance=ExtResource( 2 )] +[node name="TransparentChecker" parent="VBoxContainer/AspectRatioContainer/Preview" instance=ExtResource( 2 )] show_behind_parent = true +anchor_right = 1.0 +anchor_bottom = 1.0 +margin_right = 0.0 +margin_bottom = 0.0 [node name="OptionsContainer" type="GridContainer" parent="VBoxContainer"] -margin_top = 204.0 -margin_right = 312.0 -margin_bottom = 308.0 +margin_top = 363.0 +margin_right = 527.0 +margin_bottom = 467.0 custom_constants/vseparation = 4 custom_constants/hseparation = 4 columns = 2 diff --git a/src/UI/Dialogs/ImageEffects/ResizeCanvas.gd b/src/UI/Dialogs/ImageEffects/ResizeCanvas.gd index a416f607e..219800f74 100644 --- a/src/UI/Dialogs/ImageEffects/ResizeCanvas.gd +++ b/src/UI/Dialogs/ImageEffects/ResizeCanvas.gd @@ -12,7 +12,7 @@ onready var width_spinbox : SpinBox = $VBoxContainer/OptionsContainer/WidthValue onready var height_spinbox : SpinBox = $VBoxContainer/OptionsContainer/HeightValue onready var x_spinbox : SpinBox = $VBoxContainer/OptionsContainer/XSpinBox onready var y_spinbox : SpinBox = $VBoxContainer/OptionsContainer/YSpinBox -onready var preview_rect : TextureRect = $VBoxContainer/Preview +onready var preview_rect : TextureRect = $VBoxContainer/AspectRatioContainer/Preview func _on_ResizeCanvas_about_to_show() -> void: diff --git a/src/UI/Dialogs/ImageEffects/ResizeCanvas.tscn b/src/UI/Dialogs/ImageEffects/ResizeCanvas.tscn index 11bf81dca..32e436eb4 100644 --- a/src/UI/Dialogs/ImageEffects/ResizeCanvas.tscn +++ b/src/UI/Dialogs/ImageEffects/ResizeCanvas.tscn @@ -6,6 +6,7 @@ [node name="ResizeCanvas" type="ConfirmationDialog"] margin_right = 200.0 margin_bottom = 114.0 +rect_min_size = Vector2( 172, 60.2 ) window_title = "Resize Canvas" resizable = true script = ExtResource( 2 ) @@ -114,18 +115,26 @@ margin_bottom = 150.0 mouse_default_cursor_shape = 2 text = "Center" -[node name="Preview" type="TextureRect" parent="VBoxContainer"] +[node name="AspectRatioContainer" type="AspectRatioContainer" parent="VBoxContainer"] margin_top = 172.0 margin_right = 200.0 margin_bottom = 372.0 +size_flags_vertical = 3 + +[node name="Preview" type="TextureRect" parent="VBoxContainer/AspectRatioContainer"] +margin_right = 200.0 +margin_bottom = 200.0 rect_min_size = Vector2( 200, 200 ) -size_flags_horizontal = 0 -size_flags_vertical = 0 expand = true stretch_mode = 5 -[node name="TransparentChecker" parent="VBoxContainer/Preview" instance=ExtResource( 1 )] +[node name="TransparentChecker" parent="VBoxContainer/AspectRatioContainer/Preview" instance=ExtResource( 1 )] show_behind_parent = true +anchor_right = 1.0 +anchor_bottom = 1.0 +margin_right = 0.0 +margin_bottom = 0.0 + [connection signal="about_to_show" from="." to="." method="_on_ResizeCanvas_about_to_show"] [connection signal="confirmed" from="." to="." method="_on_ResizeCanvas_confirmed"] [connection signal="popup_hide" from="." to="." method="_on_ResizeCanvas_popup_hide"] diff --git a/src/UI/Dialogs/ImageEffects/RotateImage.gd b/src/UI/Dialogs/ImageEffects/RotateImage.gd index 465ef6322..b08dbc282 100644 --- a/src/UI/Dialogs/ImageEffects/RotateImage.gd +++ b/src/UI/Dialogs/ImageEffects/RotateImage.gd @@ -13,7 +13,7 @@ func _ready() -> void: func set_nodes() -> void: - preview = $VBoxContainer/Preview + preview = $VBoxContainer/AspectRatioContainer/Preview selection_checkbox = $VBoxContainer/OptionsContainer/SelectionCheckBox affect_option_button = $VBoxContainer/OptionsContainer/AffectOptionButton diff --git a/src/UI/Dialogs/ImageEffects/RotateImage.tscn b/src/UI/Dialogs/ImageEffects/RotateImage.tscn index aa7c50ff0..375d9af09 100644 --- a/src/UI/Dialogs/ImageEffects/RotateImage.tscn +++ b/src/UI/Dialogs/ImageEffects/RotateImage.tscn @@ -6,6 +6,7 @@ [node name="RotateImage" type="ConfirmationDialog"] margin_right = 245.0 margin_bottom = 241.0 +rect_min_size = Vector2( 172, 60.2 ) window_title = "Rotate Image" resizable = true script = ExtResource( 1 ) @@ -24,22 +25,29 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="Preview" type="TextureRect" parent="VBoxContainer"] -margin_left = 31.0 -margin_right = 231.0 +[node name="AspectRatioContainer" type="AspectRatioContainer" parent="VBoxContainer"] +margin_right = 278.0 +margin_bottom = 200.0 +size_flags_vertical = 3 + +[node name="Preview" type="TextureRect" parent="VBoxContainer/AspectRatioContainer"] +margin_left = 39.0 +margin_right = 239.0 margin_bottom = 200.0 rect_min_size = Vector2( 200, 200 ) -size_flags_horizontal = 4 -size_flags_vertical = 3 expand = true stretch_mode = 5 -[node name="TransparentChecker" parent="VBoxContainer/Preview" instance=ExtResource( 2 )] +[node name="TransparentChecker" parent="VBoxContainer/AspectRatioContainer/Preview" instance=ExtResource( 2 )] show_behind_parent = true +anchor_right = 1.0 +anchor_bottom = 1.0 +margin_right = 0.0 +margin_bottom = 0.0 [node name="HBoxContainer2" type="HBoxContainer" parent="VBoxContainer"] margin_top = 204.0 -margin_right = 263.0 +margin_right = 278.0 margin_bottom = 224.0 [node name="Label" type="Label" parent="VBoxContainer/HBoxContainer2"] @@ -50,7 +58,7 @@ text = "Type:" [node name="TypeOptionButton" type="OptionButton" parent="VBoxContainer/HBoxContainer2"] margin_left = 38.0 -margin_right = 263.0 +margin_right = 278.0 margin_bottom = 20.0 mouse_default_cursor_shape = 2 size_flags_horizontal = 3 @@ -58,7 +66,7 @@ size_flags_vertical = 3 [node name="AngleOptions" type="HBoxContainer" parent="VBoxContainer"] margin_top = 228.0 -margin_right = 263.0 +margin_right = 278.0 margin_bottom = 252.0 [node name="Label" type="Label" parent="VBoxContainer/AngleOptions"] @@ -69,7 +77,7 @@ text = "Angle:" [node name="AngleHSlider" type="HSlider" parent="VBoxContainer/AngleOptions"] margin_left = 44.0 -margin_right = 185.0 +margin_right = 200.0 margin_bottom = 24.0 mouse_default_cursor_shape = 2 size_flags_horizontal = 3 @@ -80,8 +88,8 @@ __meta__ = { } [node name="AngleSpinBox" type="SpinBox" parent="VBoxContainer/AngleOptions"] -margin_left = 189.0 -margin_right = 263.0 +margin_left = 204.0 +margin_right = 278.0 margin_bottom = 24.0 mouse_default_cursor_shape = 2 max_value = 359.0 @@ -89,7 +97,7 @@ suffix = "°" [node name="OptionsContainer" type="HBoxContainer" parent="VBoxContainer"] margin_top = 256.0 -margin_right = 263.0 +margin_right = 278.0 margin_bottom = 280.0 [node name="SelectionCheckBox" type="CheckBox" parent="VBoxContainer/OptionsContainer"] @@ -101,7 +109,7 @@ text = "Only affect selection" [node name="AffectOptionButton" type="OptionButton" parent="VBoxContainer/OptionsContainer"] margin_left = 164.0 -margin_right = 263.0 +margin_right = 278.0 margin_bottom = 24.0 mouse_default_cursor_shape = 2 text = "Selected cels"