huskee/Pixelorama
1
0
Fork 0
mirror of https://github.com/Orama-Interactive/Pixelorama.git synced 2025-02-22 05:23:14 +00:00
Code Issues Wiki Activity

Load the image of the cursor once

Browse source 
This should fix some rare crashes as well
This commit is contained in:
OverloadedOrama 2020-02-12 00:38:35 +02:00
parent d1793c2e60
commit f3759d677e
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Scripts/Canvas.gd
View file

@ -248,7 +248,7 @@ func _input(event : InputEvent) -> void:
Global.cursor_position_label.text = "[%s×%s] %s, %s" % [size.x, size.y, mouse_pos_floored.x, mouse_pos_floored.y] Global.cursor_position_label.text = "[%s×%s] %s, %s" % [size.x, size.y, mouse_pos_floored.x, mouse_pos_floored.y]
if !cursor_inside_canvas: if !cursor_inside_canvas:
cursor_inside_canvas = true cursor_inside_canvas = true
Input.set_custom_mouse_cursor(load("res://Assets/Graphics/Cursor.png"), 0, Vector2(15, 15)) Input.set_custom_mouse_cursor(Global.cursor_image, 0, Vector2(15, 15))
if Global.show_left_tool_icon: if Global.show_left_tool_icon:
Global.left_cursor.visible = true Global.left_cursor.visible = true
if Global.show_right_tool_icon: if Global.show_right_tool_icon:

3
Scripts/Global.gd
View file

@ -19,15 +19,16 @@ var has_focus := false
var canvases := [] var canvases := []
# warning-ignore:unused_class_variable # warning-ignore:unused_class_variable
var hidden_canvases := [] var hidden_canvases := []
var pressure_sensitivity_mode = Pressure_Sensitivity.ALPHA var pressure_sensitivity_mode = Pressure_Sensitivity.ALPHA
var smooth_zoom := true var smooth_zoom := true
var cursor_image = preload("res://Assets/Graphics/Cursor.png")
var left_cursor_tool_texture : ImageTexture var left_cursor_tool_texture : ImageTexture
var right_cursor_tool_texture : ImageTexture var right_cursor_tool_texture : ImageTexture
var transparent_background : ImageTexture var transparent_background : ImageTexture
# warning-ignore:unused_class_variable # warning-ignore:unused_class_variable
var selected_pixels := [] var selected_pixels := []
var image_clipboard : Image var image_clipboard : Image
# warning-ignore:unused_class_variable # warning-ignore:unused_class_variable
var theme_type := "Dark" var theme_type := "Dark"
# warning-ignore:unused_class_variable # warning-ignore:unused_class_variable