online multiplayer chess game (note server currently down)
Diffstat (limited to 'ui/colorpicker/ColorPickerButton.gd')
-rw-r--r--ui/colorpicker/ColorPickerButton.gd22
1 files changed, 12 insertions, 10 deletions
diff --git a/ui/colorpicker/ColorPickerButton.gd b/ui/colorpicker/ColorPickerButton.gd
index 7baf17e..a15dc6e 100644
--- a/ui/colorpicker/ColorPickerButton.gd
+++ b/ui/colorpicker/ColorPickerButton.gd
@@ -1,26 +1,28 @@
extends Control
class_name ColorPickerButtonBetter
-onready var colorpicker = $"ColorPicker"
+onready var popup: Popup = $Popup
+onready var colorpicker := $Popup/ColorPicker
signal newcolor(color)
var color: Color setget set_color
-func set_color(newcolor):
+func set_color(newcolor: Color) -> void:
color = newcolor
add_color_override("font_color", color)
- colorpicker.color = color
-func _ready():
- colorpicker.set_as_toplevel(true)
- colorpicker.rect_global_position = $Position.rect_global_position
- $Position.queue_free()
-
-
-func _on_ColorPicker_done(newcolor: Color):
+func _on_ColorPicker_done(newcolor: Color) -> void:
set_color(newcolor)
+ popup.hide()
colorpicker.hide()
emit_signal("newcolor", color)
+
+
+func _pressed() -> void:
+ var rect := popup.get_global_rect()
+ rect.position = rect_global_position + Vector2(50, 50)
+ popup.popup(rect)
+ colorpicker.open(color)