tonytins/CozyPixelStudio
1
0
Fork 0
mirror of https://github.com/tonytins/CozyPixelStudio.git synced 2025-06-25 06:54:43 -04:00
Code Issues Projects Releases Wiki Activity

When the palette, outline and rotate image dialogs are open, the user can't zoom in the canvas anymore.

Browse source
This commit is contained in:
OverloadedOrama 2020-04-07 18:13:35 +03:00
parent f5ab5c3987
commit 83188a54d9
6 changed files with 21 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Scripts/Main.gd
View file

@ -357,6 +357,7 @@ func image_menu_id_pressed(id : int) -> void:
var image : Image = Global.canvas.layers[Global.current_layer][0]
$RotateImage.set_sprite(image)
$RotateImage.popup_centered()
Global.can_draw = false
5: # Invert Colors
var image : Image = Global.canvas.layers[Global.current_layer][0]
Global.canvas.handle_undo("Draw")
@ -381,6 +382,7 @@ func image_menu_id_pressed(id : int) -> void:
Global.canvas.handle_redo("Draw")
7: # Outline
$OutlineDialog.popup_centered()
Global.can_draw = false
func help_menu_id_pressed(id : int) -> void:
match id:

5
Scripts/Palette/EditPalettePopup.gd
View file

@ -22,6 +22,7 @@ func open(palette : String) -> void:
if Global.palettes.has(palette):
working_palette = Global.palettes[palette].duplicate()
_display_palette()
Global.can_draw = false
self.popup_centered()
left_color_button.modulate = Global.left_color_picker.color
@ -148,3 +149,7 @@ func _on_LeftColor_pressed() -> void:
func _on_RightColor_pressed() -> void:
color_picker.color = Global.right_color_picker.color
_on_EditPaletteColorPicker_color_changed(color_picker.color)
func _on_EditPalettePopup_popup_hide() -> void:
Global.can_draw = true

6
Scripts/Palette/PaletteContainer.gd
View file

@ -63,6 +63,7 @@ func on_palette_import_file_selected(path : String) -> void:
Global.error_dialog.popup_centered()
func _on_AddPalette_pressed() -> void:
Global.can_draw = false
Global.add_palette_button.get_child(0).popup(Rect2(Global.add_palette_button.rect_global_position, Vector2.ONE))
func on_new_palette_confirmed() -> void:
@ -119,6 +120,7 @@ func on_edit_palette() -> void:
Global.new_palette_dialog.window_title = "Create a new custom palette from existing default?"
Global.new_palette_name_line_edit.text = "Custom_" + current_palette
Global.new_palette_dialog.popup_centered()
Global.can_draw = false
else:
from_palette = null
Global.edit_palette_popup.open(current_palette)
@ -193,3 +195,7 @@ func get_palette_files(path : String) -> Array:
func save_palette(palette_name : String, filename : String) -> void:
var palette = Global.palettes[palette_name]
palette.save_to_file(palettes_path.plus_file(filename))
func _on_NewPaletteDialog_popup_hide() -> void:
Global.can_draw = true