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

Merge branch 'master' into palette_updates

Browse source
This commit is contained in:
CheetoHead 2019-12-17 19:49:28 -05:00
commit 18b9480a00
53 changed files with 1233 additions and 145 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Scripts/Canvas.gd
View file

@ -49,6 +49,7 @@ func _ready() -> void:
frame_button.get_node("FrameButton").frame = frame
frame_button.get_node("FrameButton").pressed = true
frame_button.get_node("FrameID").text = str(frame + 1)
frame_button.get_node("FrameID").add_color_override("font_color", Color("#3c5d75"))
Global.frame_container.add_child(frame_button)
frame_texture_rect = Global.find_node_by_name(frame_button, "FrameTexture")

2
Scripts/Global.gd
View file

@ -395,8 +395,10 @@ func frame_changed(value : int) -> void:
#Make all frame buttons unpressed
for c in canvases:
c.frame_button.get_node("FrameButton").pressed = false
c.frame_button.get_node("FrameID").add_color_override("font_color", Color.white)
#Make only the current frame button pressed
canvas.frame_button.get_node("FrameButton").pressed = true
canvas.frame_button.get_node("FrameID").add_color_override("font_color", Color("#3c5d75"))
func create_brush_button(brush_img : Image, brush_type := BRUSH_TYPES.CUSTOM, hint_tooltip := "") -> void:

28
Scripts/Main.gd
View file

@ -51,18 +51,18 @@ func _ready() -> void:
OS.window_size = config_cache.get_value("window", "size")
var file_menu_items := {
"New..." : KEY_MASK_CTRL + KEY_N,
"Open..." : KEY_MASK_CTRL + KEY_O,
"Save..." : KEY_MASK_CTRL + KEY_S,
"Save as..." : KEY_MASK_SHIFT + KEY_MASK_CTRL + KEY_S,
"Import PNG..." : KEY_MASK_CTRL + KEY_I,
"Export PNG..." : KEY_MASK_CTRL + KEY_E,
"Export PNG as..." : KEY_MASK_SHIFT + KEY_MASK_CTRL + KEY_E,
"Quit" : KEY_MASK_CTRL + KEY_Q
"New..." : KEY_MASK_CMD + KEY_N,
"Open..." : KEY_MASK_CMD + KEY_O,
"Save..." : KEY_MASK_CMD + KEY_S,
"Save as..." : KEY_MASK_SHIFT + KEY_MASK_CMD + KEY_S,
"Import PNG..." : KEY_MASK_CMD + KEY_I,
"Export PNG..." : KEY_MASK_CMD + KEY_E,
"Export PNG as..." : KEY_MASK_SHIFT + KEY_MASK_CMD + KEY_E,
"Quit" : KEY_MASK_CMD + KEY_Q
}
var edit_menu_items := {
"Undo" : KEY_MASK_CTRL + KEY_Z,
"Redo" : KEY_MASK_SHIFT + KEY_MASK_CTRL + KEY_Z,
"Undo" : KEY_MASK_CMD + KEY_Z,
"Redo" : KEY_MASK_SHIFT + KEY_MASK_CMD + KEY_Z,
"Scale Image" : 0,
"Crop Image" : 0,
"Clear Selection" : 0,
@ -71,10 +71,10 @@ func _ready() -> void:
"Preferences" : 0
}
var view_menu_items := {
"Tile Mode" : KEY_MASK_CTRL + KEY_T,
"Show Grid" : KEY_MASK_CTRL + KEY_G,
"Show Rulers" : KEY_MASK_CTRL + KEY_R,
"Show Guides" : KEY_MASK_CTRL + KEY_Y
"Tile Mode" : KEY_MASK_CMD + KEY_T,
"Show Grid" : KEY_MASK_CMD + KEY_G,
"Show Rulers" : KEY_MASK_CMD + KEY_R,
"Show Guides" : KEY_MASK_CMD + KEY_Y
}
var help_menu_items := {
"About Pixelorama" : 0