huskee/Pixelorama
1
0
Fork 0
mirror of https://github.com/Orama-Interactive/Pixelorama.git synced 2025-01-31 07:29:49 +00:00
Code Issues Wiki Activity

Removed brush_selected signal

Browse source
This commit is contained in:
OverloadedOrama 2020-05-21 20:33:00 +03:00
parent 0629449bdf
commit d2539f44f0
6 changed files with 36 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/Autoload/Global.gd
View file

@ -856,7 +856,6 @@ func create_brush_button(brush_img : Image, brush_type := Brush_Types.CUSTOM, hi
brush_button.get_child(0).texture = brush_tex
brush_button.hint_tooltip = hint_tooltip
brush_button.mouse_default_cursor_shape = Control.CURSOR_POINTING_HAND
brush_button.connect("brush_selected",control,"_on_Brush_Selected")
if brush_type == Brush_Types.RANDOM_FILE:
brush_button.random_brushes.append(brush_img)
brush_container.add_child(brush_button)

4
src/Main.gd
View file

@ -616,10 +616,6 @@ func _on_Tool_pressed(tool_pressed : BaseButton, mouse_press := true, key_for_le
Global.right_cursor_tool_texture.create_from_image(load("res://assets/graphics/cursor_icons/%s_cursor.png" % Global.current_right_tool.to_lower()), 0)
func _on_Brush_Selected() -> void:
$BrushesPopup.hide()
func show_quit_dialog() -> void:
if !$QuitDialog.visible:
if !Global.project_has_changed:

3
src/Main.tscn
View file

@ -224,9 +224,6 @@ visible = false
visible = false
[node name="ModulateTween" type="Tween" parent="."]
[connection signal="brush_selected" from="BrushesPopup/TabContainer/File/FileBrushContainer/PixelBrushButton" to="." method="_on_Brush_Selected"]
[connection signal="brush_selected" from="BrushesPopup/TabContainer/File/FileBrushContainer/CircleBrushButton" to="." method="_on_Brush_Selected"]
[connection signal="brush_selected" from="BrushesPopup/TabContainer/File/FileBrushContainer/FilledCircleBrushButton" to="." method="_on_Brush_Selected"]
[connection signal="popup_hide" from="SplashDialog" to="." method="_can_draw_true"]
[connection signal="popup_hide" from="CreateNewImage" to="." method="_can_draw_true"]
[connection signal="file_selected" from="OpenSprite" to="." method="_on_OpenSprite_file_selected"]

6
src/UI/BrushButton.gd
View file

@ -1,8 +1,6 @@
extends BaseButton
signal brush_selected
export var brush_type = 0 # Global.Brush_Types.PIXEL
export var custom_brush_index := -3
var random_brushes := []
@ -36,7 +34,7 @@ func _on_BrushButton_pressed() -> void:
# Global.left_brush_type_label.text = tr("Brush: Filled Circle")
Global.update_left_custom_brush()
emit_signal("brush_selected")
Global.brushes_popup.hide()
else: # Change right brush
Global.current_right_brush_type = brush_type
@ -59,7 +57,7 @@ func _on_BrushButton_pressed() -> void:
# Global.right_brush_type_label.text = tr("Brush: Filled Circle")
Global.update_right_custom_brush()
emit_signal("brush_selected")
Global.brushes_popup.hide()
func _on_DeleteButton_pressed() -> void:

5
src/UI/BrushButton.tscn
View file

File diff suppressed because one or more lines are too long

91
src/UI/UI.tscn
View file

@ -1,10 +1,7 @@
[gd_scene load_steps=26 format=2]
[gd_scene load_steps=23 format=2]
[ext_resource path="res://src/Canvas.gd" type="Script" id=1]
[ext_resource path="res://src/UI/SecondViewport.gd" type="Script" id=2]
[ext_resource path="res://src/UI/Timeline/AnimationTimeline.gd" type="Script" id=3]
[ext_resource path="res://src/UI/Rulers/VerticalRuler.gd" type="Script" id=4]
[ext_resource path="res://src/UI/ColorAndToolOptions.gd" type="Script" id=5]
[ext_resource path="res://src/UI/Rulers/HorizontalRuler.gd" type="Script" id=6]
[ext_resource path="res://src/CameraMovement.gd" type="Script" id=7]
[ext_resource path="res://src/SelectionRectangle.gd" type="Script" id=8]
@ -41,6 +38,9 @@ margin_bottom = 720.0
size_flags_horizontal = 3
size_flags_vertical = 3
custom_constants/separation = 0
__meta__ = {
"_edit_use_anchors_": false
}
[node name="ToolPanel" type="Panel" parent="."]
margin_right = 48.0
@ -59,10 +59,10 @@ __meta__ = {
}
[node name="Tools" type="VBoxContainer" parent="ToolPanel/PanelContainer"]
margin_left = 4.5
margin_top = 3.0
margin_right = 36.5
margin_bottom = 251.0
margin_left = 7.0
margin_top = 7.0
margin_right = 39.0
margin_bottom = 255.0
__meta__ = {
"_edit_use_anchors_": false
}
@ -201,13 +201,13 @@ custom_constants/autohide = 0
[node name="HViewportContainer" type="HBoxContainer" parent="CanvasAndTimeline"]
margin_right = 902.0
margin_bottom = 486.0
margin_bottom = 480.0
size_flags_horizontal = 3
size_flags_vertical = 3
[node name="ViewportAndRulers" type="VBoxContainer" parent="CanvasAndTimeline/HViewportContainer"]
margin_right = 902.0
margin_bottom = 486.0
margin_bottom = 480.0
size_flags_horizontal = 3
size_flags_vertical = 3
custom_constants/separation = 0
@ -229,20 +229,20 @@ script = ExtResource( 6 )
[node name="HSplitContainer" type="HSplitContainer" parent="CanvasAndTimeline/HViewportContainer/ViewportAndRulers"]
margin_top = 16.0
margin_right = 902.0
margin_bottom = 486.0
margin_bottom = 480.0
size_flags_vertical = 3
custom_constants/autohide = 0
[node name="ViewportandVerticalRuler" type="HBoxContainer" parent="CanvasAndTimeline/HViewportContainer/ViewportAndRulers/HSplitContainer"]
margin_right = 896.0
margin_bottom = 470.0
margin_right = 890.0
margin_bottom = 464.0
size_flags_horizontal = 3
size_flags_vertical = 3
custom_constants/separation = 0
[node name="VerticalRuler" type="Button" parent="CanvasAndTimeline/HViewportContainer/ViewportAndRulers/HSplitContainer/ViewportandVerticalRuler"]
margin_right = 16.0
margin_bottom = 470.0
margin_bottom = 464.0
rect_min_size = Vector2( 16, 0 )
focus_mode = 0
mouse_default_cursor_shape = 15
@ -258,8 +258,8 @@ script = ExtResource( 4 )
[node name="ViewportContainer" type="ViewportContainer" parent="CanvasAndTimeline/HViewportContainer/ViewportAndRulers/HSplitContainer/ViewportandVerticalRuler"]
margin_left = 16.0
margin_right = 896.0
margin_bottom = 470.0
margin_right = 890.0
margin_bottom = 464.0
focus_mode = 2
size_flags_horizontal = 3
size_flags_vertical = 3
@ -267,7 +267,7 @@ stretch = true
script = ExtResource( 23 )
[node name="Viewport" type="Viewport" parent="CanvasAndTimeline/HViewportContainer/ViewportAndRulers/HSplitContainer/ViewportandVerticalRuler/ViewportContainer"]
size = Vector2( 880, 470 )
size = Vector2( 874, 464 )
handle_input_locally = false
usage = 0
render_target_update_mode = 3
@ -279,8 +279,7 @@ margin_bottom = 40.0
mouse_filter = 2
script = ExtResource( 22 )
[node name="Canvas" type="Node2D" parent="CanvasAndTimeline/HViewportContainer/ViewportAndRulers/HSplitContainer/ViewportandVerticalRuler/ViewportContainer/Viewport" instance=ExtResource( 19 )]
script = ExtResource( 1 )
[node name="Canvas" parent="CanvasAndTimeline/HViewportContainer/ViewportAndRulers/HSplitContainer/ViewportandVerticalRuler/ViewportContainer/Viewport" instance=ExtResource( 19 )]
[node name="Camera2D" type="Camera2D" parent="CanvasAndTimeline/HViewportContainer/ViewportAndRulers/HSplitContainer/ViewportandVerticalRuler/ViewportContainer/Viewport"]
current = true
@ -299,13 +298,13 @@ script = ExtResource( 8 )
[node name="ViewportContainer2" type="ViewportContainer" parent="CanvasAndTimeline/HViewportContainer/ViewportAndRulers/HSplitContainer"]
margin_left = 902.0
margin_right = 902.0
margin_bottom = 470.0
margin_bottom = 464.0
size_flags_vertical = 3
stretch = true
script = ExtResource( 23 )
[node name="Viewport" type="Viewport" parent="CanvasAndTimeline/HViewportContainer/ViewportAndRulers/HSplitContainer/ViewportContainer2"]
size = Vector2( 0, 470 )
size = Vector2( 0, 464 )
handle_input_locally = false
render_target_update_mode = 3
script = ExtResource( 2 )
@ -315,17 +314,10 @@ current = true
zoom = Vector2( 0.15, 0.15 )
script = ExtResource( 7 )
[node name="AnimationTimeline" type="Panel" parent="CanvasAndTimeline" instance=ExtResource( 18 )]
[node name="AnimationTimeline" parent="CanvasAndTimeline" instance=ExtResource( 18 )]
margin_top = 492.0
margin_right = 902.0
margin_bottom = 692.0
rect_min_size = Vector2( 0, 200 )
size_flags_horizontal = 3
custom_styles/panel = SubResource( 2 )
script = ExtResource( 3 )
__meta__ = {
"_edit_use_anchors_": false
}
[node name="RightPanel" type="Panel" parent="."]
margin_left = 950.0
@ -344,16 +336,16 @@ __meta__ = {
}
[node name="PanelContainer" type="PanelContainer" parent="RightPanel/PreviewAndPalettes"]
margin_left = 10.0
margin_right = 319.0
margin_bottom = 156.0
margin_left = 8.0
margin_right = 322.0
margin_bottom = 164.0
size_flags_horizontal = 4
[node name="CanvasPreview" type="ViewportContainer" parent="RightPanel/PreviewAndPalettes/PanelContainer"]
margin_left = 4.5
margin_top = 3.0
margin_right = 304.5
margin_bottom = 153.0
margin_left = 7.0
margin_top = 7.0
margin_right = 307.0
margin_bottom = 157.0
rect_min_size = Vector2( 0, 150 )
[node name="Viewport" type="Viewport" parent="RightPanel/PreviewAndPalettes/PanelContainer/CanvasPreview"]
@ -370,33 +362,18 @@ zoom = Vector2( 0.15, 0.15 )
script = ExtResource( 7 )
[node name="ToolAndPaletteVSplit" type="VSplitContainer" parent="RightPanel/PreviewAndPalettes"]
margin_top = 160.0
margin_top = 168.0
margin_right = 330.0
margin_bottom = 676.0
size_flags_vertical = 3
custom_constants/autohide = 0
[node name="ColorAndToolOptions" type="VBoxContainer" parent="RightPanel/PreviewAndPalettes/ToolAndPaletteVSplit" instance=ExtResource( 17 )]
margin_right = 330.0
margin_bottom = 255.0
size_flags_vertical = 3
custom_constants/separation = 8
script = ExtResource( 5 )
__meta__ = {
"_edit_use_anchors_": false
}
[node name="ColorAndToolOptions" parent="RightPanel/PreviewAndPalettes/ToolAndPaletteVSplit" instance=ExtResource( 17 )]
margin_bottom = 248.0
[node name="PalettePanelContainer" type="PanelContainer" parent="RightPanel/PreviewAndPalettes/ToolAndPaletteVSplit" instance=ExtResource( 20 )]
margin_left = 15.0
margin_top = 261.0
margin_right = 315.0
margin_bottom = 516.0
rect_min_size = Vector2( 300, 0 )
size_flags_horizontal = 4
size_flags_vertical = 3
__meta__ = {
"_edit_use_anchors_": false
}
[node name="PalettePanelContainer" parent="RightPanel/PreviewAndPalettes/ToolAndPaletteVSplit" instance=ExtResource( 20 )]
margin_top = 260.0
margin_bottom = 508.0
[connection signal="mouse_entered" from="CanvasAndTimeline/HViewportContainer/ViewportAndRulers/HorizontalRuler" to="CanvasAndTimeline/HViewportContainer/ViewportAndRulers/HorizontalRuler" method="_on_HorizontalRuler_mouse_entered"]
[connection signal="pressed" from="CanvasAndTimeline/HViewportContainer/ViewportAndRulers/HorizontalRuler" to="CanvasAndTimeline/HViewportContainer/ViewportAndRulers/HorizontalRuler" method="_on_HorizontalRuler_pressed"]
[connection signal="pressed" from="CanvasAndTimeline/HViewportContainer/ViewportAndRulers/HSplitContainer/ViewportandVerticalRuler/VerticalRuler" to="CanvasAndTimeline/HViewportContainer/ViewportAndRulers/HSplitContainer/ViewportandVerticalRuler/VerticalRuler" method="_on_VerticalRuler_pressed"]