maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #48618 from Calinou/colorpicker-click-old-color-to-revert

Browse source 
Implement reverting to the old color when clicking it in ColorPicker
This commit is contained in:
Rémi Verschelde 2021-05-10 21:38:31 +02:00 committed by GitHub
parent 24a783afe3 1e063595c3
commit 347737907d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
scene/gui/color_picker.cpp
View file

@ -470,6 +470,19 @@ void ColorPicker::_update_text_value() {
c_text->set_visible(visible);
}
void ColorPicker::_sample_input(const Ref<InputEvent> &p_event) {
const Ref<InputEventMouseButton> mb = p_event;
if (mb.is_valid() && mb->is_pressed() && mb->get_button_index() == MOUSE_BUTTON_LEFT) {
const Rect2 rect_old = Rect2(Point2(), Size2(sample->get_size().width * 0.5, sample->get_size().height * 0.95));
if (rect_old.has_point(mb->get_position())) {
// Revert to the old color when left-clicking the old color sample.
color = old_color;
_update_color();
emit_signal("color_changed", color);
}
}
}
void ColorPicker::_sample_draw() {
// Covers the right half of the sample if the old color is being displayed,
// or the whole sample if it's not being displayed.
@ -1067,6 +1080,7 @@ ColorPicker::ColorPicker() :
hb_smpl->add_child(sample);
sample->set_h_size_flags(SIZE_EXPAND_FILL);
sample->connect("gui_input", callable_mp(this, &ColorPicker::_sample_input));
sample->connect("draw", callable_mp(this, &ColorPicker::_sample_draw));
btn_pick->set_flat(true);
@ -1210,7 +1224,9 @@ ColorPicker::ColorPicker() :
void ColorPickerButton::_about_to_popup() {
set_pressed(true);
picker->set_old_color(color);
if (picker) {
picker->set_old_color(color);
}
}
void ColorPickerButton::_color_changed(const Color &p_color) {

1
scene/gui/color_picker.h
View file

@ -108,6 +108,7 @@ private:
void _update_presets();
void _update_text_value();
void _text_type_toggled();
void _sample_input(const Ref<InputEvent> &p_event);
void _sample_draw();
void _hsv_draw(int p_which, Control *c);
void _slider_draw(int p_which);