huskee/Pixelorama
1
0
Fork 0
mirror of https://github.com/Orama-Interactive/Pixelorama.git synced 2025-01-18 09:09:47 +00:00
Code Issues Wiki Activity

Attempt to fix left tool preview not being shown when a right tool with a preview is selected

Browse source 
Maybe fixes #1157
This commit is contained in:
Emmanouil Papadeas 2024-12-21 03:44:54 +02:00
parent 033238b787
commit 59254b943f
5 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/Tools/BaseShapeDrawer.gd
View file

@ -148,6 +148,7 @@ func draw_end(pos: Vector2i) -> void:
_start = Vector2i.ZERO _start = Vector2i.ZERO
_dest = Vector2i.ZERO _dest = Vector2i.ZERO
_drawing = false _drawing = false
Global.canvas.previews_sprite.texture = null
_displace_origin = false _displace_origin = false
cursor_text = "" cursor_text = ""
super.draw_end(pos) super.draw_end(pos)
@ -174,8 +175,6 @@ func draw_preview() -> void:
image.set_pixelv(point, Color.WHITE) image.set_pixelv(point, Color.WHITE)
var texture := ImageTexture.create_from_image(image) var texture := ImageTexture.create_from_image(image)
canvas.texture = texture canvas.texture = texture
else:
canvas.texture = null
func _draw_shape(origin: Vector2i, dest: Vector2i) -> void: func _draw_shape(origin: Vector2i, dest: Vector2i) -> void:

3
src/Tools/DesignTools/LineTool.gd
View file

@ -142,6 +142,7 @@ func draw_end(pos: Vector2i) -> void:
_start = Vector2.ZERO _start = Vector2.ZERO
_dest = Vector2.ZERO _dest = Vector2.ZERO
_drawing = false _drawing = false
Global.canvas.previews_sprite.texture = null
_displace_origin = false _displace_origin = false
cursor_text = "" cursor_text = ""
super.draw_end(pos) super.draw_end(pos)
@ -163,8 +164,6 @@ func draw_preview() -> void:
image.set_pixelv(point, Color.WHITE) image.set_pixelv(point, Color.WHITE)
var texture := ImageTexture.create_from_image(image) var texture := ImageTexture.create_from_image(image)
canvas.texture = texture canvas.texture = texture
else:
canvas.texture = null
func _draw_shape() -> void: func _draw_shape() -> void:

3
src/Tools/SelectionTools/EllipseSelect.gd
View file

@ -68,8 +68,6 @@ func draw_preview() -> void:
image.set_pixelv(point, Color.WHITE) image.set_pixelv(point, Color.WHITE)
var texture := ImageTexture.create_from_image(image) var texture := ImageTexture.create_from_image(image)
canvas.texture = texture canvas.texture = texture
else:
canvas.texture = null
func apply_selection(_position: Vector2i) -> void: func apply_selection(_position: Vector2i) -> void:
@ -111,6 +109,7 @@ func apply_selection(_position: Vector2i) -> void:
Global.canvas.selection.big_bounding_rectangle = project.selection_map.get_used_rect() Global.canvas.selection.big_bounding_rectangle = project.selection_map.get_used_rect()
Global.canvas.selection.commit_undo("Select", undo_data) Global.canvas.selection.commit_undo("Select", undo_data)
Global.canvas.previews_sprite.texture = null
func set_ellipse(selection_map: SelectionMap, pos: Vector2i) -> void: func set_ellipse(selection_map: SelectionMap, pos: Vector2i) -> void:

3
src/Tools/SelectionTools/Lasso.gd
View file

@ -54,8 +54,6 @@ func draw_preview() -> void:
image.set_pixelv(draw_point, Color.WHITE) image.set_pixelv(draw_point, Color.WHITE)
var texture := ImageTexture.create_from_image(image) var texture := ImageTexture.create_from_image(image)
canvas.texture = texture canvas.texture = texture
else:
canvas.texture = null
func apply_selection(_position) -> void: func apply_selection(_position) -> void:
@ -82,6 +80,7 @@ func apply_selection(_position) -> void:
Global.canvas.selection.commit_undo("Select", undo_data) Global.canvas.selection.commit_undo("Select", undo_data)
_draw_points.clear() _draw_points.clear()
_last_position = Vector2.INF _last_position = Vector2.INF
Global.canvas.previews_sprite.texture = null
func lasso_selection( func lasso_selection(

3
src/Tools/SelectionTools/PaintSelect.gd
View file

@ -82,8 +82,6 @@ func draw_preview() -> void:
image.set_pixelv(draw_point, Color.WHITE) image.set_pixelv(draw_point, Color.WHITE)
var texture := ImageTexture.create_from_image(image) var texture := ImageTexture.create_from_image(image)
canvas.texture = texture canvas.texture = texture
else:
canvas.texture = null
func apply_selection(pos: Vector2i) -> void: func apply_selection(pos: Vector2i) -> void:
@ -111,6 +109,7 @@ func apply_selection(pos: Vector2i) -> void:
Global.canvas.selection.commit_undo("Select", undo_data) Global.canvas.selection.commit_undo("Select", undo_data)
_draw_points.clear() _draw_points.clear()
_last_position = Vector2.INF _last_position = Vector2.INF
Global.canvas.previews_sprite.texture = null
func paint_selection( func paint_selection(