ColorPicker UX improvements
- Tabs and MenuButton for mode selection and enabling/disabling colorized sliders - MenuButton for shape selection with new icon for each shape - Drag and drop functionality for presets to arrange order - A chronological list of recently selected presets which are global for the editor - Presets are now highlighted as being active or inactive - Thicker sliders for easy targeting - `grabber_offset` theme constant for Slider - Uncolorized sliders
This commit is contained in:
Vitika9
parent
a49ec435b2
commit
1dce43d417
15 changed files with 737 additions and 112 deletions
|
|
@ -44,6 +44,7 @@
|
|||
#include "thirdparty/misc/ok_color_shader.h"
|
||||
|
||||
List<Color> ColorPicker::preset_cache;
|
||||
List<Color> ColorPicker::recent_preset_cache;
|
||||
|
||||
void ColorPicker::_notification(int p_what) {
|
||||
switch (p_what) {
|
||||
|
|
@ -61,14 +62,31 @@ void ColorPicker::_notification(int p_what) {
|
|||
for (int i = 0; i < preset_cache.size(); i++) {
|
||||
presets.push_back(preset_cache[i]);
|
||||
}
|
||||
|
||||
if (recent_preset_cache.is_empty()) {
|
||||
PackedColorArray saved_recent_presets = EditorSettings::get_singleton()->get_project_metadata("color_picker", "recent_presets", PackedColorArray());
|
||||
for (int i = 0; i < saved_recent_presets.size(); i++) {
|
||||
recent_preset_cache.push_back(saved_recent_presets[i]);
|
||||
}
|
||||
}
|
||||
|
||||
for (int i = 0; i < recent_preset_cache.size(); i++) {
|
||||
recent_presets.push_back(recent_preset_cache[i]);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
[[fallthrough]];
|
||||
}
|
||||
case NOTIFICATION_THEME_CHANGED: {
|
||||
btn_pick->set_icon(get_theme_icon(SNAME("screen_picker"), SNAME("ColorPicker")));
|
||||
_update_drop_down_arrow(btn_preset->is_pressed(), btn_preset);
|
||||
_update_drop_down_arrow(btn_recent_preset->is_pressed(), btn_recent_preset);
|
||||
btn_add_preset->set_icon(get_theme_icon(SNAME("add_preset")));
|
||||
|
||||
btn_pick->set_custom_minimum_size(Size2(28 * get_theme_default_base_scale(), 0));
|
||||
btn_shape->set_custom_minimum_size(Size2(28 * get_theme_default_base_scale(), 0));
|
||||
btn_mode->set_custom_minimum_size(Size2(28 * get_theme_default_base_scale(), 0));
|
||||
|
||||
uv_edit->set_custom_minimum_size(Size2(get_theme_constant(SNAME("sv_width")), get_theme_constant(SNAME("sv_height"))));
|
||||
w_edit->set_custom_minimum_size(Size2(get_theme_constant(SNAME("h_width")), 0));
|
||||
|
||||
|
|
@ -90,12 +108,13 @@ void ColorPicker::_notification(int p_what) {
|
|||
}
|
||||
|
||||
_update_presets();
|
||||
_update_recent_presets();
|
||||
_update_controls();
|
||||
} break;
|
||||
|
||||
case NOTIFICATION_VISIBILITY_CHANGED: {
|
||||
Popup *p = Object::cast_to<Popup>(get_parent());
|
||||
if (p) {
|
||||
if (p && is_visible_in_tree()) {
|
||||
p->set_size(Size2(get_combined_minimum_size().width + get_theme_constant(SNAME("margin")) * 2, get_combined_minimum_size().height + get_theme_constant(SNAME("margin")) * 2));
|
||||
}
|
||||
} break;
|
||||
|
|
@ -262,6 +281,11 @@ void ColorPicker::_update_controls() {
|
|||
}
|
||||
|
||||
void ColorPicker::_set_pick_color(const Color &p_color, bool p_update_sliders) {
|
||||
if (text_changed) {
|
||||
add_recent_preset(color);
|
||||
text_changed = false;
|
||||
}
|
||||
|
||||
color = p_color;
|
||||
if (color != last_color) {
|
||||
_copy_color_to_hsv();
|
||||
|
|
@ -330,7 +354,6 @@ void ColorPicker::_value_changed(double) {
|
|||
|
||||
void ColorPicker::add_mode(ColorMode *p_mode) {
|
||||
modes.push_back(p_mode);
|
||||
mode_option_button->add_item(RTR(p_mode->get_name()));
|
||||
}
|
||||
|
||||
void ColorPicker::create_slider(GridContainer *gc, int idx) {
|
||||
|
|
@ -346,13 +369,21 @@ void ColorPicker::create_slider(GridContainer *gc, int idx) {
|
|||
SpinBox *v = memnew(SpinBox);
|
||||
s->share(v);
|
||||
gc->add_child(v);
|
||||
v->get_line_edit()->connect("focus_entered", callable_mp(this, &ColorPicker::_focus_enter));
|
||||
v->get_line_edit()->connect("focus_exited", callable_mp(this, &ColorPicker::_focus_exit));
|
||||
|
||||
LineEdit *vle = v->get_line_edit();
|
||||
vle->connect("focus_entered", callable_mp(this, &ColorPicker::_focus_enter), CONNECT_DEFERRED);
|
||||
vle->connect("focus_exited", callable_mp(this, &ColorPicker::_focus_exit));
|
||||
vle->connect("text_changed", callable_mp(this, &ColorPicker::_text_changed));
|
||||
vle->connect("gui_input", callable_mp(this, &ColorPicker::_line_edit_input));
|
||||
vle->set_horizontal_alignment(HORIZONTAL_ALIGNMENT_RIGHT);
|
||||
|
||||
v->connect("gui_input", callable_mp(this, &ColorPicker::_slider_or_spin_input));
|
||||
|
||||
s->set_h_size_flags(SIZE_EXPAND_FILL);
|
||||
|
||||
s->connect("value_changed", callable_mp(this, &ColorPicker::_value_changed));
|
||||
s->connect("draw", callable_mp(this, &ColorPicker::_slider_draw).bind(idx));
|
||||
s->connect("gui_input", callable_mp(this, &ColorPicker::_slider_or_spin_input));
|
||||
|
||||
if (idx < SLIDER_COUNT) {
|
||||
sliders[idx] = s;
|
||||
|
|
@ -401,25 +432,53 @@ void ColorPicker::_copy_hsv_to_color() {
|
|||
}
|
||||
}
|
||||
|
||||
void ColorPicker::_select_from_preset_container(const Color &p_color) {
|
||||
if (preset_group->get_pressed_button()) {
|
||||
preset_group->get_pressed_button()->set_pressed(false);
|
||||
}
|
||||
|
||||
for (int i = 1; i < preset_container->get_child_count(); i++) {
|
||||
ColorPresetButton *current_btn = Object::cast_to<ColorPresetButton>(preset_container->get_child(i));
|
||||
if (current_btn && p_color == current_btn->get_preset_color()) {
|
||||
current_btn->set_pressed(true);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
bool ColorPicker::_select_from_recent_preset_hbc(const Color &p_color) {
|
||||
for (int i = 0; i < recent_preset_hbc->get_child_count(); i++) {
|
||||
ColorPresetButton *current_btn = Object::cast_to<ColorPresetButton>(recent_preset_hbc->get_child(i));
|
||||
if (current_btn && p_color == current_btn->get_preset_color()) {
|
||||
current_btn->set_pressed(true);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
ColorPicker::PickerShapeType ColorPicker::_get_actual_shape() const {
|
||||
return modes[current_mode]->get_shape_override() != SHAPE_MAX ? modes[current_mode]->get_shape_override() : current_shape;
|
||||
}
|
||||
|
||||
void ColorPicker::_reset_theme() {
|
||||
Ref<StyleBoxEmpty> style_box_empty(memnew(StyleBoxEmpty));
|
||||
|
||||
Ref<StyleBoxFlat> style_box_flat(memnew(StyleBoxFlat));
|
||||
style_box_flat->set_default_margin(SIDE_TOP, 16 * get_theme_default_base_scale());
|
||||
style_box_flat->set_bg_color(Color(0.2, 0.23, 0.31).lerp(Color(0, 0, 0, 1), 0.3).clamp());
|
||||
for (int i = 0; i < SLIDER_COUNT; i++) {
|
||||
sliders[i]->add_theme_icon_override("grabber", get_theme_icon(SNAME("bar_arrow"), SNAME("ColorPicker")));
|
||||
sliders[i]->add_theme_icon_override("grabber_highlight", get_theme_icon(SNAME("bar_arrow"), SNAME("ColorPicker")));
|
||||
sliders[i]->add_theme_style_override("slider", style_box_empty);
|
||||
sliders[i]->add_theme_style_override("grabber_area", style_box_empty);
|
||||
sliders[i]->add_theme_style_override("grabber_area_highlight", style_box_empty);
|
||||
sliders[i]->add_theme_constant_override("grabber_offset", 8 * get_theme_default_base_scale());
|
||||
if (!colorize_sliders) {
|
||||
sliders[i]->add_theme_style_override("slider", style_box_flat);
|
||||
}
|
||||
}
|
||||
alpha_slider->add_theme_icon_override("grabber", get_theme_icon(SNAME("bar_arrow"), SNAME("ColorPicker")));
|
||||
alpha_slider->add_theme_icon_override("grabber_highlight", get_theme_icon(SNAME("bar_arrow"), SNAME("ColorPicker")));
|
||||
alpha_slider->add_theme_style_override("slider", style_box_empty);
|
||||
alpha_slider->add_theme_style_override("grabber_area", style_box_empty);
|
||||
alpha_slider->add_theme_style_override("grabber_area_highlight", style_box_empty);
|
||||
alpha_slider->add_theme_constant_override("grabber_offset", 8 * get_theme_default_base_scale());
|
||||
if (!colorize_sliders) {
|
||||
alpha_slider->add_theme_style_override("slider", style_box_flat);
|
||||
}
|
||||
}
|
||||
|
||||
void ColorPicker::_html_submitted(const String &p_html) {
|
||||
|
|
@ -481,13 +540,41 @@ void ColorPicker::_update_presets() {
|
|||
cpb->set_custom_minimum_size(Size2(preset_size, preset_size));
|
||||
}
|
||||
}
|
||||
// Only load preset buttons when the only child is the add-preset button.
|
||||
if (preset_container->get_child_count() == 1) {
|
||||
for (int i = 0; i < preset_cache.size(); i++) {
|
||||
_add_preset_button(preset_size, preset_cache[i]);
|
||||
|
||||
#ifdef TOOLS_ENABLED
|
||||
if (Engine::get_singleton()->is_editor_hint()) {
|
||||
// Only load preset buttons when the only child is the add-preset button.
|
||||
if (preset_container->get_child_count() == 1) {
|
||||
for (int i = 0; i < preset_cache.size(); i++) {
|
||||
_add_preset_button(preset_size, preset_cache[i]);
|
||||
}
|
||||
_notification(NOTIFICATION_VISIBILITY_CHANGED);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
void ColorPicker::_update_recent_presets() {
|
||||
#ifdef TOOLS_ENABLED
|
||||
if (Engine::get_singleton()->is_editor_hint()) {
|
||||
int recent_preset_count = recent_preset_hbc->get_child_count();
|
||||
for (int i = 0; i < recent_preset_count; i++) {
|
||||
memdelete(recent_preset_hbc->get_child(0));
|
||||
}
|
||||
|
||||
recent_presets.clear();
|
||||
for (int i = 0; i < recent_preset_cache.size(); i++) {
|
||||
recent_presets.push_back(recent_preset_cache[i]);
|
||||
}
|
||||
|
||||
int preset_size = _get_preset_size();
|
||||
for (int i = 0; i < recent_presets.size(); i++) {
|
||||
_add_recent_preset_button(preset_size, recent_presets[i]);
|
||||
}
|
||||
|
||||
_notification(NOTIFICATION_VISIBILITY_CHANGED);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
void ColorPicker::_text_type_toggled() {
|
||||
|
|
@ -497,11 +584,13 @@ void ColorPicker::_text_type_toggled() {
|
|||
text_type->set_icon(get_theme_icon(SNAME("Script"), SNAME("EditorIcons")));
|
||||
|
||||
c_text->set_editable(false);
|
||||
c_text->set_h_size_flags(SIZE_EXPAND_FILL);
|
||||
} else {
|
||||
text_type->set_text("#");
|
||||
text_type->set_icon(nullptr);
|
||||
|
||||
c_text->set_editable(true);
|
||||
c_text->set_h_size_flags(SIZE_FILL);
|
||||
}
|
||||
_update_color();
|
||||
}
|
||||
|
|
@ -512,9 +601,14 @@ Color ColorPicker::get_pick_color() const {
|
|||
|
||||
void ColorPicker::set_picker_shape(PickerShapeType p_shape) {
|
||||
ERR_FAIL_INDEX(p_shape, SHAPE_MAX);
|
||||
if (current_shape == p_shape) {
|
||||
if (p_shape == current_shape) {
|
||||
return;
|
||||
}
|
||||
shape_popup->set_item_checked(current_shape, false);
|
||||
shape_popup->set_item_checked(p_shape, true);
|
||||
|
||||
btn_shape->set_icon(shape_popup->get_item_icon(p_shape));
|
||||
|
||||
current_shape = p_shape;
|
||||
|
||||
_copy_color_to_hsv();
|
||||
|
|
@ -528,45 +622,105 @@ ColorPicker::PickerShapeType ColorPicker::get_picker_shape() const {
|
|||
}
|
||||
|
||||
inline int ColorPicker::_get_preset_size() {
|
||||
return (int(get_minimum_size().width) - (preset_container->get_theme_constant(SNAME("h_separation")) * (preset_column_count - 1))) / preset_column_count;
|
||||
return (int(get_minimum_size().width) - (preset_container->get_theme_constant(SNAME("h_separation")) * (PRESET_COLUMN_COUNT - 1))) / PRESET_COLUMN_COUNT;
|
||||
}
|
||||
|
||||
void ColorPicker::_add_preset_button(int p_size, const Color &p_color) {
|
||||
ColorPresetButton *btn_preset = memnew(ColorPresetButton(p_color));
|
||||
btn_preset->set_preset_color(p_color);
|
||||
btn_preset->set_custom_minimum_size(Size2(p_size, p_size));
|
||||
btn_preset->connect("gui_input", callable_mp(this, &ColorPicker::_preset_input).bind(p_color));
|
||||
ColorPresetButton *btn_preset = memnew(ColorPresetButton(p_color, p_size));
|
||||
btn_preset->set_tooltip_text(vformat(RTR("Color: #%s\nLMB: Apply color\nRMB: Remove preset"), p_color.to_html(p_color.a < 1)));
|
||||
btn_preset->set_drag_forwarding(this);
|
||||
btn_preset->set_button_group(preset_group);
|
||||
preset_container->add_child(btn_preset);
|
||||
btn_preset->set_pressed(true);
|
||||
btn_preset->connect("gui_input", callable_mp(this, &ColorPicker::_preset_input).bind(p_color));
|
||||
}
|
||||
|
||||
void ColorPicker::_set_color_mode(ColorModeType p_mode) {
|
||||
if (slider_theme_modified) {
|
||||
_reset_theme();
|
||||
void ColorPicker::_add_recent_preset_button(int p_size, const Color &p_color) {
|
||||
ColorPresetButton *btn_preset = memnew(ColorPresetButton(p_color, p_size));
|
||||
btn_preset->set_tooltip_text(vformat(RTR("Color: #%s\nLMB: Apply color"), p_color.to_html(p_color.a < 1)));
|
||||
btn_preset->set_button_group(recent_preset_group);
|
||||
recent_preset_hbc->add_child(btn_preset);
|
||||
recent_preset_hbc->move_child(btn_preset, 0);
|
||||
btn_preset->set_pressed(true);
|
||||
btn_preset->connect("toggled", callable_mp(this, &ColorPicker::_recent_preset_pressed).bind(btn_preset));
|
||||
}
|
||||
|
||||
void ColorPicker::_show_hide_preset(const bool &p_is_btn_pressed, Button *p_btn_preset, Container *p_preset_container) {
|
||||
if (p_is_btn_pressed) {
|
||||
p_preset_container->show();
|
||||
} else {
|
||||
p_preset_container->hide();
|
||||
}
|
||||
_update_drop_down_arrow(p_is_btn_pressed, p_btn_preset);
|
||||
}
|
||||
|
||||
void ColorPicker::_update_drop_down_arrow(const bool &p_is_btn_pressed, Button *p_btn_preset) {
|
||||
if (p_is_btn_pressed) {
|
||||
p_btn_preset->set_icon(get_theme_icon(SNAME("expanded_arrow"), SNAME("ColorPicker")));
|
||||
} else {
|
||||
p_btn_preset->set_icon(get_theme_icon(SNAME("folded_arrow"), SNAME("ColorPicker")));
|
||||
}
|
||||
}
|
||||
|
||||
void ColorPicker::_set_mode_popup_value(ColorModeType p_mode) {
|
||||
ERR_FAIL_INDEX(p_mode, MODE_MAX + 1);
|
||||
|
||||
if (p_mode == MODE_MAX) {
|
||||
set_colorize_sliders(!colorize_sliders);
|
||||
} else {
|
||||
set_color_mode(p_mode);
|
||||
}
|
||||
}
|
||||
|
||||
Variant ColorPicker::_get_drag_data_fw(const Point2 &p_point, Control *p_from_control) {
|
||||
ColorPresetButton *dragged_preset_button = Object::cast_to<ColorPresetButton>(p_from_control);
|
||||
|
||||
if (!dragged_preset_button) {
|
||||
return Variant();
|
||||
}
|
||||
|
||||
current_mode = p_mode;
|
||||
ColorPresetButton *drag_preview = memnew(ColorPresetButton(dragged_preset_button->get_preset_color(), _get_preset_size()));
|
||||
set_drag_preview(drag_preview);
|
||||
|
||||
if (!is_inside_tree()) {
|
||||
Dictionary drag_data;
|
||||
drag_data["type"] = "color_preset";
|
||||
drag_data["color_preset"] = dragged_preset_button->get_index();
|
||||
|
||||
return drag_data;
|
||||
}
|
||||
|
||||
bool ColorPicker::_can_drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from_control) const {
|
||||
Dictionary d = p_data;
|
||||
if (!d.has("type") || String(d["type"]) != "color_preset") {
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
void ColorPicker::_drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from_control) {
|
||||
Dictionary d = p_data;
|
||||
if (!d.has("type")) {
|
||||
return;
|
||||
}
|
||||
|
||||
_update_controls();
|
||||
_update_color();
|
||||
if (String(d["type"]) == "color_preset") {
|
||||
int preset_from_id = d["color_preset"];
|
||||
int hover_now = p_from_control->get_index();
|
||||
|
||||
if (preset_from_id == hover_now || hover_now == -1) {
|
||||
return;
|
||||
}
|
||||
preset_container->move_child(preset_container->get_child(preset_from_id), hover_now);
|
||||
}
|
||||
}
|
||||
|
||||
void ColorPicker::add_preset(const Color &p_color) {
|
||||
if (presets.find(p_color)) {
|
||||
presets.move_to_back(presets.find(p_color));
|
||||
List<Color>::Element *e = presets.find(p_color);
|
||||
if (e) {
|
||||
presets.move_to_back(e);
|
||||
preset_cache.move_to_back(preset_cache.find(p_color));
|
||||
|
||||
// Find button to move to the end.
|
||||
for (int i = 1; i < preset_container->get_child_count(); i++) {
|
||||
ColorPresetButton *current_btn = Object::cast_to<ColorPresetButton>(preset_container->get_child(i));
|
||||
if (current_btn && p_color == current_btn->get_preset_color()) {
|
||||
preset_container->move_child(current_btn, preset_container->get_child_count() - 1);
|
||||
break;
|
||||
}
|
||||
}
|
||||
preset_container->move_child(preset_group->get_pressed_button(), preset_container->get_child_count() - 1);
|
||||
} else {
|
||||
presets.push_back(p_color);
|
||||
preset_cache.push_back(p_color);
|
||||
|
|
@ -582,9 +736,31 @@ void ColorPicker::add_preset(const Color &p_color) {
|
|||
#endif
|
||||
}
|
||||
|
||||
void ColorPicker::add_recent_preset(const Color &p_color) {
|
||||
if (!_select_from_recent_preset_hbc(p_color)) {
|
||||
if (recent_preset_hbc->get_child_count() >= PRESET_COLUMN_COUNT) {
|
||||
recent_preset_cache.pop_front();
|
||||
recent_presets.pop_front();
|
||||
recent_preset_hbc->get_child(PRESET_COLUMN_COUNT - 1)->queue_delete();
|
||||
}
|
||||
recent_presets.push_back(p_color);
|
||||
recent_preset_cache.push_back(p_color);
|
||||
_add_recent_preset_button(_get_preset_size(), p_color);
|
||||
}
|
||||
_select_from_preset_container(p_color);
|
||||
|
||||
#ifdef TOOLS_ENABLED
|
||||
if (Engine::get_singleton()->is_editor_hint()) {
|
||||
PackedColorArray arr_to_save = get_recent_presets();
|
||||
EditorSettings::get_singleton()->set_project_metadata("color_picker", "recent_presets", arr_to_save);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
void ColorPicker::erase_preset(const Color &p_color) {
|
||||
if (presets.find(p_color)) {
|
||||
presets.erase(presets.find(p_color));
|
||||
List<Color>::Element *e = presets.find(p_color);
|
||||
if (e) {
|
||||
presets.erase(e);
|
||||
preset_cache.erase(preset_cache.find(p_color));
|
||||
|
||||
// Find preset button to remove.
|
||||
|
|
@ -605,6 +781,30 @@ void ColorPicker::erase_preset(const Color &p_color) {
|
|||
}
|
||||
}
|
||||
|
||||
void ColorPicker::erase_recent_preset(const Color &p_color) {
|
||||
List<Color>::Element *e = recent_presets.find(p_color);
|
||||
if (e) {
|
||||
recent_presets.erase(e);
|
||||
recent_preset_cache.erase(recent_preset_cache.find(p_color));
|
||||
|
||||
// Find recent preset button to remove.
|
||||
for (int i = 1; i < recent_preset_hbc->get_child_count(); i++) {
|
||||
ColorPresetButton *current_btn = Object::cast_to<ColorPresetButton>(recent_preset_hbc->get_child(i));
|
||||
if (current_btn && p_color == current_btn->get_preset_color()) {
|
||||
current_btn->queue_delete();
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef TOOLS_ENABLED
|
||||
if (Engine::get_singleton()->is_editor_hint()) {
|
||||
PackedColorArray arr_to_save = get_recent_presets();
|
||||
EditorSettings::get_singleton()->set_project_metadata("color_picker", "recent_presets", arr_to_save);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
PackedColorArray ColorPicker::get_presets() const {
|
||||
PackedColorArray arr;
|
||||
arr.resize(presets.size());
|
||||
|
|
@ -614,16 +814,84 @@ PackedColorArray ColorPicker::get_presets() const {
|
|||
return arr;
|
||||
}
|
||||
|
||||
PackedColorArray ColorPicker::get_recent_presets() const {
|
||||
PackedColorArray arr;
|
||||
arr.resize(recent_presets.size());
|
||||
for (int i = 0; i < recent_presets.size(); i++) {
|
||||
arr.set(i, recent_presets[i]);
|
||||
}
|
||||
return arr;
|
||||
}
|
||||
|
||||
void ColorPicker::set_color_mode(ColorModeType p_mode) {
|
||||
ERR_FAIL_INDEX(p_mode, MODE_MAX);
|
||||
mode_option_button->select(p_mode);
|
||||
_set_color_mode(p_mode);
|
||||
|
||||
if (current_mode == p_mode) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (slider_theme_modified) {
|
||||
_reset_theme();
|
||||
}
|
||||
|
||||
mode_popup->set_item_checked(current_mode, false);
|
||||
mode_popup->set_item_checked(p_mode, true);
|
||||
|
||||
if (p_mode < MODE_BUTTON_COUNT) {
|
||||
mode_btns[p_mode]->set_pressed(true);
|
||||
} else if (current_mode < MODE_BUTTON_COUNT) {
|
||||
mode_btns[current_mode]->set_pressed(false);
|
||||
}
|
||||
|
||||
current_mode = p_mode;
|
||||
|
||||
if (!is_inside_tree()) {
|
||||
return;
|
||||
}
|
||||
|
||||
_update_controls();
|
||||
_update_color();
|
||||
}
|
||||
|
||||
ColorPicker::ColorModeType ColorPicker::get_color_mode() const {
|
||||
return current_mode;
|
||||
}
|
||||
|
||||
void ColorPicker::set_colorize_sliders(bool p_colorize_sliders) {
|
||||
if (colorize_sliders == p_colorize_sliders) {
|
||||
return;
|
||||
}
|
||||
|
||||
colorize_sliders = p_colorize_sliders;
|
||||
mode_popup->set_item_checked(MODE_MAX + 1, colorize_sliders);
|
||||
|
||||
if (colorize_sliders) {
|
||||
Ref<StyleBoxEmpty> style_box_empty(memnew(StyleBoxEmpty));
|
||||
|
||||
if (!slider_theme_modified) {
|
||||
for (int i = 0; i < SLIDER_COUNT; i++) {
|
||||
sliders[i]->add_theme_style_override("slider", style_box_empty);
|
||||
}
|
||||
}
|
||||
alpha_slider->add_theme_style_override("slider", style_box_empty);
|
||||
} else {
|
||||
Ref<StyleBoxFlat> style_box_flat(memnew(StyleBoxFlat));
|
||||
style_box_flat->set_default_margin(SIDE_TOP, 16 * get_theme_default_base_scale());
|
||||
style_box_flat->set_bg_color(Color(0.2, 0.23, 0.31).lerp(Color(0, 0, 0, 1), 0.3).clamp());
|
||||
|
||||
if (!slider_theme_modified) {
|
||||
for (int i = 0; i < SLIDER_COUNT; i++) {
|
||||
sliders[i]->add_theme_style_override("slider", style_box_flat);
|
||||
}
|
||||
}
|
||||
alpha_slider->add_theme_style_override("slider", style_box_flat);
|
||||
}
|
||||
}
|
||||
|
||||
bool ColorPicker::is_colorizing_sliders() const {
|
||||
return colorize_sliders;
|
||||
}
|
||||
|
||||
void ColorPicker::set_deferred_mode(bool p_enabled) {
|
||||
deferred_mode_enabled = p_enabled;
|
||||
}
|
||||
|
|
@ -859,17 +1127,19 @@ void ColorPicker::_hsv_draw(int p_which, Control *c) {
|
|||
}
|
||||
|
||||
void ColorPicker::_slider_draw(int p_which) {
|
||||
modes[current_mode]->slider_draw(p_which);
|
||||
if (colorize_sliders) {
|
||||
modes[current_mode]->slider_draw(p_which);
|
||||
}
|
||||
}
|
||||
|
||||
void ColorPicker::_uv_input(const Ref<InputEvent> &p_event, Control *c) {
|
||||
Ref<InputEventMouseButton> bev = p_event;
|
||||
PickerShapeType current_picker = _get_actual_shape();
|
||||
PickerShapeType actual_shape = _get_actual_shape();
|
||||
|
||||
if (bev.is_valid()) {
|
||||
if (bev->is_pressed() && bev->get_button_index() == MouseButton::LEFT) {
|
||||
Vector2 center = c->get_size() / 2.0;
|
||||
if (current_picker == SHAPE_VHS_CIRCLE || current_picker == SHAPE_OKHSL_CIRCLE) {
|
||||
if (actual_shape == SHAPE_VHS_CIRCLE || actual_shape == SHAPE_OKHSL_CIRCLE) {
|
||||
real_t dist = center.distance_to(bev->get_position());
|
||||
if (dist <= center.x) {
|
||||
real_t rad = center.angle_to_point(bev->get_position());
|
||||
|
|
@ -917,8 +1187,11 @@ void ColorPicker::_uv_input(const Ref<InputEvent> &p_event, Control *c) {
|
|||
if (!deferred_mode_enabled) {
|
||||
emit_signal(SNAME("color_changed"), color);
|
||||
}
|
||||
} else if (deferred_mode_enabled && !bev->is_pressed() && bev->get_button_index() == MouseButton::LEFT) {
|
||||
emit_signal(SNAME("color_changed"), color);
|
||||
} else if (!bev->is_pressed() && bev->get_button_index() == MouseButton::LEFT) {
|
||||
if (deferred_mode_enabled) {
|
||||
emit_signal(SNAME("color_changed"), color);
|
||||
}
|
||||
add_recent_preset(color);
|
||||
changing_color = false;
|
||||
spinning = false;
|
||||
} else {
|
||||
|
|
@ -935,7 +1208,7 @@ void ColorPicker::_uv_input(const Ref<InputEvent> &p_event, Control *c) {
|
|||
}
|
||||
|
||||
Vector2 center = c->get_size() / 2.0;
|
||||
if (current_picker == SHAPE_VHS_CIRCLE || current_picker == SHAPE_OKHSL_CIRCLE) {
|
||||
if (actual_shape == SHAPE_VHS_CIRCLE || actual_shape == SHAPE_OKHSL_CIRCLE) {
|
||||
real_t dist = center.distance_to(mev->get_position());
|
||||
real_t rad = center.angle_to_point(mev->get_position());
|
||||
h = ((rad >= 0) ? rad : (Math_TAU + rad)) / Math_TAU;
|
||||
|
|
@ -990,9 +1263,10 @@ void ColorPicker::_w_input(const Ref<InputEvent> &p_event) {
|
|||
set_pick_color(color);
|
||||
_update_color();
|
||||
|
||||
if (!deferred_mode_enabled) {
|
||||
if (!bev->is_pressed() && bev->get_button_index() == MouseButton::LEFT) {
|
||||
add_recent_preset(color);
|
||||
emit_signal(SNAME("color_changed"), color);
|
||||
} else if (!bev->is_pressed() && bev->get_button_index() == MouseButton::LEFT) {
|
||||
} else if (!deferred_mode_enabled) {
|
||||
emit_signal(SNAME("color_changed"), color);
|
||||
}
|
||||
}
|
||||
|
|
@ -1021,12 +1295,31 @@ void ColorPicker::_w_input(const Ref<InputEvent> &p_event) {
|
|||
}
|
||||
}
|
||||
|
||||
void ColorPicker::_slider_or_spin_input(const Ref<InputEvent> &p_event) {
|
||||
if (line_edit_mouse_release) {
|
||||
line_edit_mouse_release = false;
|
||||
return;
|
||||
}
|
||||
Ref<InputEventMouseButton> bev = p_event;
|
||||
if (bev.is_valid() && !bev->is_pressed() && bev->get_button_index() == MouseButton::LEFT) {
|
||||
add_recent_preset(color);
|
||||
}
|
||||
}
|
||||
|
||||
void ColorPicker::_line_edit_input(const Ref<InputEvent> &p_event) {
|
||||
Ref<InputEventMouseButton> bev = p_event;
|
||||
if (bev.is_valid() && !bev->is_pressed() && bev->get_button_index() == MouseButton::LEFT) {
|
||||
line_edit_mouse_release = true;
|
||||
}
|
||||
}
|
||||
|
||||
void ColorPicker::_preset_input(const Ref<InputEvent> &p_event, const Color &p_color) {
|
||||
Ref<InputEventMouseButton> bev = p_event;
|
||||
|
||||
if (bev.is_valid()) {
|
||||
if (bev->is_pressed() && bev->get_button_index() == MouseButton::LEFT) {
|
||||
set_pick_color(p_color);
|
||||
add_recent_preset(color);
|
||||
emit_signal(SNAME("color_changed"), p_color);
|
||||
} else if (bev->is_pressed() && bev->get_button_index() == MouseButton::RIGHT && presets_enabled) {
|
||||
erase_preset(p_color);
|
||||
|
|
@ -1035,6 +1328,22 @@ void ColorPicker::_preset_input(const Ref<InputEvent> &p_event, const Color &p_c
|
|||
}
|
||||
}
|
||||
|
||||
void ColorPicker::_recent_preset_pressed(const bool p_pressed, ColorPresetButton *p_preset) {
|
||||
if (!p_pressed) {
|
||||
return;
|
||||
}
|
||||
set_pick_color(p_preset->get_preset_color());
|
||||
|
||||
recent_presets.move_to_back(recent_presets.find(p_preset->get_preset_color()));
|
||||
List<Color>::Element *e = recent_preset_cache.find(p_preset->get_preset_color());
|
||||
if (e) {
|
||||
recent_preset_cache.move_to_back(e);
|
||||
}
|
||||
|
||||
recent_preset_hbc->move_child(p_preset, 0);
|
||||
emit_signal(SNAME("color_changed"), p_preset->get_preset_color());
|
||||
}
|
||||
|
||||
void ColorPicker::_screen_input(const Ref<InputEvent> &p_event) {
|
||||
if (!is_inside_tree()) {
|
||||
return;
|
||||
|
|
@ -1063,6 +1372,10 @@ void ColorPicker::_screen_input(const Ref<InputEvent> &p_event) {
|
|||
}
|
||||
}
|
||||
|
||||
void ColorPicker::_text_changed(const String &) {
|
||||
text_changed = true;
|
||||
}
|
||||
|
||||
void ColorPicker::_add_preset_pressed() {
|
||||
add_preset(color);
|
||||
emit_signal(SNAME("preset_added"), color);
|
||||
|
|
@ -1159,7 +1472,6 @@ void ColorPicker::set_presets_visible(bool p_visible) {
|
|||
return;
|
||||
}
|
||||
presets_visible = p_visible;
|
||||
preset_separator->set_visible(p_visible);
|
||||
preset_container->set_visible(p_visible);
|
||||
}
|
||||
|
||||
|
|
@ -1183,9 +1495,16 @@ void ColorPicker::_bind_methods() {
|
|||
ClassDB::bind_method(D_METHOD("add_preset", "color"), &ColorPicker::add_preset);
|
||||
ClassDB::bind_method(D_METHOD("erase_preset", "color"), &ColorPicker::erase_preset);
|
||||
ClassDB::bind_method(D_METHOD("get_presets"), &ColorPicker::get_presets);
|
||||
ClassDB::bind_method(D_METHOD("add_recent_preset", "color"), &ColorPicker::add_recent_preset);
|
||||
ClassDB::bind_method(D_METHOD("erase_recent_preset", "color"), &ColorPicker::erase_recent_preset);
|
||||
ClassDB::bind_method(D_METHOD("get_recent_presets"), &ColorPicker::get_recent_presets);
|
||||
ClassDB::bind_method(D_METHOD("set_picker_shape", "shape"), &ColorPicker::set_picker_shape);
|
||||
ClassDB::bind_method(D_METHOD("get_picker_shape"), &ColorPicker::get_picker_shape);
|
||||
|
||||
ClassDB::bind_method(D_METHOD("_get_drag_data_fw"), &ColorPicker::_get_drag_data_fw);
|
||||
ClassDB::bind_method(D_METHOD("_can_drop_data_fw"), &ColorPicker::_can_drop_data_fw);
|
||||
ClassDB::bind_method(D_METHOD("_drop_data_fw"), &ColorPicker::_drop_data_fw);
|
||||
|
||||
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::INT, "color_mode", PROPERTY_HINT_ENUM, "RGB,HSV,RAW,OKHSL"), "set_color_mode", "get_color_mode");
|
||||
|
|
@ -1213,7 +1532,7 @@ ColorPicker::ColorPicker() :
|
|||
BoxContainer(true) {
|
||||
HBoxContainer *hb_edit = memnew(HBoxContainer);
|
||||
add_child(hb_edit, false, INTERNAL_MODE_FRONT);
|
||||
hb_edit->set_v_size_flags(SIZE_EXPAND_FILL);
|
||||
hb_edit->set_v_size_flags(SIZE_SHRINK_BEGIN);
|
||||
|
||||
uv_edit = memnew(Control);
|
||||
hb_edit->add_child(uv_edit);
|
||||
|
|
@ -1226,24 +1545,82 @@ ColorPicker::ColorPicker() :
|
|||
HBoxContainer *hb_smpl = memnew(HBoxContainer);
|
||||
add_child(hb_smpl, false, INTERNAL_MODE_FRONT);
|
||||
|
||||
btn_pick = memnew(Button);
|
||||
hb_smpl->add_child(btn_pick);
|
||||
btn_pick->set_toggle_mode(true);
|
||||
btn_pick->set_tooltip_text(RTR("Pick a color from the editor window."));
|
||||
btn_pick->connect("pressed", callable_mp(this, &ColorPicker::_screen_pick_pressed));
|
||||
|
||||
sample = memnew(TextureRect);
|
||||
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 = memnew(Button);
|
||||
btn_pick->set_flat(true);
|
||||
hb_smpl->add_child(btn_pick);
|
||||
btn_pick->set_toggle_mode(true);
|
||||
btn_pick->set_tooltip_text(RTR("Pick a color from the editor window."));
|
||||
btn_pick->connect("pressed", callable_mp(this, &ColorPicker::_screen_pick_pressed));
|
||||
btn_shape = memnew(MenuButton);
|
||||
btn_shape->set_flat(false);
|
||||
hb_smpl->add_child(btn_shape);
|
||||
btn_shape->set_toggle_mode(true);
|
||||
btn_shape->set_tooltip_text(RTR("Select a picker shape."));
|
||||
|
||||
current_shape = SHAPE_HSV_RECTANGLE;
|
||||
|
||||
shape_popup = btn_shape->get_popup();
|
||||
shape_popup->add_icon_radio_check_item(get_theme_icon(SNAME("shape_rect"), SNAME("ColorPicker")), "HSV Rectangle", SHAPE_HSV_RECTANGLE);
|
||||
shape_popup->add_icon_radio_check_item(get_theme_icon(SNAME("shape_rect_wheel"), SNAME("ColorPicker")), "HSV Wheel", SHAPE_HSV_WHEEL);
|
||||
shape_popup->add_icon_radio_check_item(get_theme_icon(SNAME("shape_circle"), SNAME("ColorPicker")), "VHS Circle", SHAPE_VHS_CIRCLE);
|
||||
shape_popup->add_icon_radio_check_item(get_theme_icon(SNAME("shape_circle"), SNAME("ColorPicker")), "OKHSL Circle", SHAPE_OKHSL_CIRCLE);
|
||||
shape_popup->set_item_checked(current_shape, true);
|
||||
shape_popup->connect("id_pressed", callable_mp(this, &ColorPicker::set_picker_shape));
|
||||
|
||||
btn_shape->set_icon(shape_popup->get_item_icon(current_shape));
|
||||
|
||||
add_mode(new ColorModeRGB(this));
|
||||
add_mode(new ColorModeHSV(this));
|
||||
add_mode(new ColorModeRAW(this));
|
||||
add_mode(new ColorModeOKHSL(this));
|
||||
|
||||
HBoxContainer *mode_hbc = memnew(HBoxContainer);
|
||||
add_child(mode_hbc, false, INTERNAL_MODE_FRONT);
|
||||
|
||||
mode_group.instantiate();
|
||||
|
||||
for (int i = 0; i < MODE_BUTTON_COUNT; i++) {
|
||||
mode_btns[i] = memnew(Button);
|
||||
mode_hbc->add_child(mode_btns[i]);
|
||||
mode_btns[i]->set_focus_mode(FOCUS_NONE);
|
||||
mode_btns[i]->set_h_size_flags(SIZE_EXPAND_FILL);
|
||||
mode_btns[i]->add_theme_style_override("pressed", get_theme_stylebox("tab_selected", "TabContainer"));
|
||||
mode_btns[i]->add_theme_style_override("normal", get_theme_stylebox("tab_unselected", "TabContainer"));
|
||||
mode_btns[i]->add_theme_style_override("hover", get_theme_stylebox("tab_selected", "TabContainer"));
|
||||
mode_btns[i]->set_toggle_mode(true);
|
||||
mode_btns[i]->set_text(modes[i]->get_name());
|
||||
mode_btns[i]->set_button_group(mode_group);
|
||||
mode_btns[i]->connect("pressed", callable_mp(this, &ColorPicker::set_color_mode).bind((ColorModeType)i));
|
||||
}
|
||||
mode_btns[0]->set_pressed(true);
|
||||
|
||||
btn_mode = memnew(MenuButton);
|
||||
btn_mode->set_text("...");
|
||||
btn_mode->set_flat(false);
|
||||
mode_hbc->add_child(btn_mode);
|
||||
btn_mode->set_toggle_mode(true);
|
||||
btn_mode->set_tooltip_text(RTR("Select a picker mode."));
|
||||
|
||||
current_mode = MODE_RGB;
|
||||
|
||||
mode_popup = btn_mode->get_popup();
|
||||
for (int i = 0; i < modes.size(); i++) {
|
||||
mode_popup->add_radio_check_item(modes[i]->get_name(), i);
|
||||
}
|
||||
mode_popup->add_separator();
|
||||
mode_popup->add_check_item("Colorized Sliders", MODE_MAX);
|
||||
mode_popup->set_item_checked(current_mode, true);
|
||||
mode_popup->set_item_checked(MODE_MAX + 1, true);
|
||||
mode_popup->connect("id_pressed", callable_mp(this, &ColorPicker::_set_mode_popup_value));
|
||||
VBoxContainer *vbl = memnew(VBoxContainer);
|
||||
add_child(vbl, false, INTERNAL_MODE_FRONT);
|
||||
|
||||
add_child(memnew(HSeparator), false, INTERNAL_MODE_FRONT);
|
||||
|
||||
VBoxContainer *vbr = memnew(VBoxContainer);
|
||||
|
||||
add_child(vbr, false, INTERNAL_MODE_FRONT);
|
||||
|
|
@ -1262,16 +1639,10 @@ ColorPicker::ColorPicker() :
|
|||
alpha_label->set_text("A");
|
||||
|
||||
HBoxContainer *hhb = memnew(HBoxContainer);
|
||||
hhb->set_alignment(ALIGNMENT_BEGIN);
|
||||
vbr->add_child(hhb);
|
||||
|
||||
mode_option_button = memnew(OptionButton);
|
||||
|
||||
hhb->add_child(mode_option_button);
|
||||
add_mode(new ColorModeRGB(this));
|
||||
add_mode(new ColorModeHSV(this));
|
||||
add_mode(new ColorModeRAW(this));
|
||||
add_mode(new ColorModeOKHSL(this));
|
||||
mode_option_button->connect("item_selected", callable_mp(this, &ColorPicker::_set_color_mode));
|
||||
hhb->add_child(memnew(Label("Hex")));
|
||||
|
||||
text_type = memnew(Button);
|
||||
hhb->add_child(text_type);
|
||||
|
|
@ -1286,9 +1657,9 @@ ColorPicker::ColorPicker() :
|
|||
|
||||
c_text = memnew(LineEdit);
|
||||
hhb->add_child(c_text);
|
||||
c_text->set_h_size_flags(SIZE_EXPAND_FILL);
|
||||
c_text->connect("text_submitted", callable_mp(this, &ColorPicker::_html_submitted));
|
||||
c_text->connect("focus_entered", callable_mp(this, &ColorPicker::_focus_enter));
|
||||
c_text->connect("text_changed", callable_mp(this, &ColorPicker::_text_changed));
|
||||
c_text->connect("focus_entered", callable_mp(this, &ColorPicker::_focus_enter), CONNECT_DEFERRED);
|
||||
c_text->connect("focus_exited", callable_mp(this, &ColorPicker::_html_focus_exit));
|
||||
|
||||
wheel_edit = memnew(AspectRatioContainer);
|
||||
|
|
@ -1325,16 +1696,43 @@ ColorPicker::ColorPicker() :
|
|||
_update_controls();
|
||||
updating = false;
|
||||
|
||||
set_pick_color(Color(1, 1, 1));
|
||||
|
||||
preset_separator = memnew(HSeparator);
|
||||
add_child(preset_separator, false, INTERNAL_MODE_FRONT);
|
||||
|
||||
preset_container = memnew(GridContainer);
|
||||
preset_container->set_h_size_flags(SIZE_EXPAND_FILL);
|
||||
preset_container->set_columns(preset_column_count);
|
||||
preset_container->set_columns(PRESET_COLUMN_COUNT);
|
||||
preset_container->hide();
|
||||
|
||||
preset_group.instantiate();
|
||||
|
||||
btn_preset = memnew(Button);
|
||||
btn_preset->set_text("Swatches");
|
||||
btn_preset->set_flat(true);
|
||||
btn_preset->set_toggle_mode(true);
|
||||
btn_preset->set_focus_mode(FOCUS_NONE);
|
||||
btn_preset->set_text_alignment(HORIZONTAL_ALIGNMENT_LEFT);
|
||||
btn_preset->connect("toggled", callable_mp(this, &ColorPicker::_show_hide_preset).bind(btn_preset, preset_container));
|
||||
add_child(btn_preset, false, INTERNAL_MODE_FRONT);
|
||||
|
||||
add_child(preset_container, false, INTERNAL_MODE_FRONT);
|
||||
|
||||
recent_preset_hbc = memnew(HBoxContainer);
|
||||
recent_preset_hbc->set_v_size_flags(SIZE_SHRINK_BEGIN);
|
||||
recent_preset_hbc->hide();
|
||||
|
||||
recent_preset_group.instantiate();
|
||||
|
||||
btn_recent_preset = memnew(Button);
|
||||
btn_recent_preset->set_text("Recent Colors");
|
||||
btn_recent_preset->set_flat(true);
|
||||
btn_recent_preset->set_toggle_mode(true);
|
||||
btn_recent_preset->set_focus_mode(FOCUS_NONE);
|
||||
btn_recent_preset->set_text_alignment(HORIZONTAL_ALIGNMENT_LEFT);
|
||||
btn_recent_preset->connect("toggled", callable_mp(this, &ColorPicker::_show_hide_preset).bind(btn_recent_preset, recent_preset_hbc));
|
||||
add_child(btn_recent_preset, false, INTERNAL_MODE_FRONT);
|
||||
|
||||
add_child(recent_preset_hbc, false, INTERNAL_MODE_FRONT);
|
||||
|
||||
set_pick_color(Color(1, 1, 1));
|
||||
|
||||
btn_add_preset = memnew(Button);
|
||||
btn_add_preset->set_icon_alignment(HORIZONTAL_ALIGNMENT_CENTER);
|
||||
btn_add_preset->set_tooltip_text(RTR("Add current color as a preset."));
|
||||
|
|
@ -1375,6 +1773,7 @@ void ColorPickerButton::pressed() {
|
|||
|
||||
popup->reset_size();
|
||||
picker->_update_presets();
|
||||
picker->_update_recent_presets();
|
||||
|
||||
Rect2i usable_rect = popup->get_usable_parent_rect();
|
||||
//let's try different positions to see which one we can use
|
||||
|
|
@ -1481,6 +1880,7 @@ void ColorPickerButton::_update_picker() {
|
|||
picker->connect("color_changed", callable_mp(this, &ColorPickerButton::_color_changed));
|
||||
popup->connect("about_to_popup", callable_mp(this, &ColorPickerButton::_about_to_popup));
|
||||
popup->connect("popup_hide", callable_mp(this, &ColorPickerButton::_modal_closed));
|
||||
picker->connect("minimum_size_changed", callable_mp((Window *)popup, &Window::reset_size));
|
||||
picker->set_pick_color(color);
|
||||
picker->set_edit_alpha(edit_alpha);
|
||||
picker->set_display_old_color(true);
|
||||
|
|
@ -1520,6 +1920,13 @@ void ColorPresetButton::_notification(int p_what) {
|
|||
Ref<StyleBoxTexture> sb_texture = sb_raw;
|
||||
|
||||
if (sb_flat.is_valid()) {
|
||||
sb_flat->set_border_width(SIDE_BOTTOM, 2);
|
||||
if (get_draw_mode() == DRAW_PRESSED || get_draw_mode() == DRAW_HOVER_PRESSED) {
|
||||
sb_flat->set_border_color(Color(1, 1, 1, 1));
|
||||
} else {
|
||||
sb_flat->set_border_color(Color(0, 0, 0, 1));
|
||||
}
|
||||
|
||||
if (preset_color.a < 1) {
|
||||
// Draw a background pattern when the color is transparent.
|
||||
sb_flat->set_bg_color(Color(1, 1, 1));
|
||||
|
|
@ -1563,8 +1970,10 @@ Color ColorPresetButton::get_preset_color() const {
|
|||
return preset_color;
|
||||
}
|
||||
|
||||
ColorPresetButton::ColorPresetButton(Color p_color) {
|
||||
ColorPresetButton::ColorPresetButton(Color p_color, int p_size) {
|
||||
preset_color = p_color;
|
||||
set_toggle_mode(true);
|
||||
set_custom_minimum_size(Size2(p_size, p_size));
|
||||
}
|
||||
|
||||
ColorPresetButton::~ColorPresetButton() {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue