Merge branch 'Orama-Interactive:master' into dynamics-pannel-imps

Orama-Interactive · Sep 18, 2024 · 018ebd7 · 018ebd7
2 parents 464939c + 51f6816
commit 018ebd7
Show file tree

Hide file tree

Showing 13 changed files with 46 additions and 44 deletions.
diff --git a/export_presets.cfg b/export_presets.cfg
@@ -83,8 +83,8 @@ application/modify_resources=true
 application/icon="res://assets/graphics/icons/icon.ico"
 application/console_wrapper_icon=""
 application/icon_interpolation=4
-application/file_version="1.0.3.0"
-application/product_version="1.0.3.0"
+application/file_version="1.0.4.0"
+application/product_version="1.0.4.0"
 application/company_name="Orama Interactive"
 application/product_name="Pixelorama"
 application/file_description="Pixelorama - Your free & open-source sprite editor"
@@ -198,8 +198,8 @@ application/modify_resources=true
 application/icon="res://assets/graphics/icons/icon.ico"
 application/console_wrapper_icon=""
 application/icon_interpolation=4
-application/file_version="1.0.3.0"
-application/product_version="1.0.3.0"
+application/file_version="1.0.4.0"
+application/product_version="1.0.4.0"
 application/company_name="Orama Interactive"
 application/product_name="Pixelorama"
 application/file_description="Pixelorama - Your free & open-source sprite editor"
@@ -402,8 +402,8 @@ application/icon_interpolation=4
 application/bundle_identifier="com.orama-interactive.pixelorama"
 application/signature=""
 application/app_category="Graphics-design"
-application/short_version="1.0.3"
-application/version="1.0.3"
+application/short_version="1.0.4"
+application/version="1.0.4"
 application/copyright="Orama Interactive and contributors 2019-present"
 application/copyright_localized={}
 application/min_macos_version="10.12"
@@ -657,7 +657,7 @@ architectures/arm64-v8a=true
 architectures/x86=false
 architectures/x86_64=false
 version/code=1
-version/name="1.0"
+version/name="1.0.4"
 package/unique_name="com.orama_interactive.pixelorama"
 package/name="Pixelorama"
 package/signed=true

diff --git a/project.godot b/project.godot
@@ -12,7 +12,7 @@ config_version=5
 
 config/name="Pixelorama"
 config/description="Unleash your creativity with Pixelorama, a powerful and accessible open-source pixel art multitool. Whether you want to create sprites, tiles, animations, or just express yourself in the language of pixel art, this software will realize your pixel-perfect dreams with a vast toolbox of features."
-config/version="v1.0.3-stable"
+config/version="v1.0.4-dev"
 run/main_scene="res://src/Main.tscn"
 config/use_custom_user_dir=true
 config/custom_user_dir_name="pixelorama"

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -1,45 +1,43 @@
-[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
 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/ColorPickers/ColorPicker.gd b/src/UI/ColorPickers/ColorPicker.gd
@@ -98,6 +98,12 @@ func _notification(what: int) -> void:
 
 
 func _on_color_picker_color_changed(color: Color) -> void:
+	# Due to the decimal nature of the color values, some values get rounded off
+	# unintentionally before entering this method.
+	# Even though the decimal values change, the HTML code remains the same after the change.
+	# So we're using this trick to convert the values back to how they are shown in
+	# the color picker's UI.
+	color = Color(color.to_html())
 	if Tools.picking_color_for == MOUSE_BUTTON_RIGHT:
 		right_color_rect.color = color
 	else:

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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)