Merge branch 'master' into dev-generic

This commit is contained in:
RodZill4 2020-01-28 23:12:43 +01:00
commit 5717869d00

View File

@ -355,7 +355,12 @@ func update_preview_buttons(index : int) -> void:
var line = get_child(i) var line = get_child(i)
line.get_child(line.get_child_count()-1).pressed = false line.get_child(line.get_child_count()-1).pressed = false
var processing_button = false
func on_preview_button(pressed : bool, index : int) -> void: func on_preview_button(pressed : bool, index : int) -> void:
if processing_button:
return
processing_button = true
if pressed: if pressed:
preview_index = index preview_index = index
var width var width
@ -371,6 +376,7 @@ func on_preview_button(pressed : bool, index : int) -> void:
preview.visible = false preview.visible = false
remove_child(preview) remove_child(preview)
rect_size = Vector2(0, 0) rect_size = Vector2(0, 0)
processing_button = false
func update_preview(size : int = 0) -> void: func update_preview(size : int = 0) -> void:
if preview_index == -1: if preview_index == -1: