mirrors/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-01-24 11:32:51 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #18161 from flashyincceo/fixing-bug-#18128

Browse source 
Add popup_closed signal for ColorPickerButton
This commit is contained in:
Rémi Verschelde 2018-04-18 15:09:57 +02:00 • committed by GitHub
commit 67cf812e45
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
scene/gui/color_picker.cpp
View file

@ -660,6 +660,11 @@ void ColorPickerButton::_color_changed(const Color &p_color) {
emit_signal("color_changed", p_color); emit_signal("color_changed", p_color);
} }
void ColorPickerButton::_modal_closed() {
emit_signal("popup_closed");
}
void ColorPickerButton::pressed() { void ColorPickerButton::pressed() {
popup->set_position(get_global_position() - picker->get_combined_minimum_size()); popup->set_position(get_global_position() - picker->get_combined_minimum_size());
@ -722,8 +727,10 @@ void ColorPickerButton::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_edit_alpha", "show"), &ColorPickerButton::set_edit_alpha); ClassDB::bind_method(D_METHOD("set_edit_alpha", "show"), &ColorPickerButton::set_edit_alpha);
ClassDB::bind_method(D_METHOD("is_editing_alpha"), &ColorPickerButton::is_editing_alpha); ClassDB::bind_method(D_METHOD("is_editing_alpha"), &ColorPickerButton::is_editing_alpha);
ClassDB::bind_method(D_METHOD("_color_changed"), &ColorPickerButton::_color_changed); ClassDB::bind_method(D_METHOD("_color_changed"), &ColorPickerButton::_color_changed);
ClassDB::bind_method(D_METHOD("_modal_closed"), &ColorPickerButton::_modal_closed);
ADD_SIGNAL(MethodInfo("color_changed", PropertyInfo(Variant::COLOR, "color"))); ADD_SIGNAL(MethodInfo("color_changed", PropertyInfo(Variant::COLOR, "color")));
ADD_SIGNAL(MethodInfo("popup_closed"));
ADD_PROPERTY(PropertyInfo(Variant::COLOR, "color"), "set_pick_color", "get_pick_color"); ADD_PROPERTY(PropertyInfo(Variant::COLOR, "color"), "set_pick_color", "get_pick_color");
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "edit_alpha"), "set_edit_alpha", "is_editing_alpha"); ADD_PROPERTY(PropertyInfo(Variant::BOOL, "edit_alpha"), "set_edit_alpha", "is_editing_alpha");
} }
@ -735,5 +742,7 @@ ColorPickerButton::ColorPickerButton() {
popup->add_child(picker); popup->add_child(picker);
picker->connect("color_changed", this, "_color_changed"); picker->connect("color_changed", this, "_color_changed");
popup->connect("modal_closed", this, "_modal_closed");
add_child(popup); add_child(popup);
} }

2
scene/gui/color_picker.h
View file

@ -120,6 +120,8 @@ class ColorPickerButton : public Button {
ColorPicker *picker; ColorPicker *picker;
void _color_changed(const Color &p_color); void _color_changed(const Color &p_color);
void _modal_closed();
virtual void pressed(); virtual void pressed();
protected: protected: