asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #56102 from jmb462/fix-wrong-gradientedit-colorpicker-shape

Browse source
This commit is contained in:
Rémi Verschelde 2021-12-21 09:43:26 +01:00 committed by GitHub
commit 011c0279c5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
editor/plugins/gradient_editor_plugin.cpp
View file

@ -118,6 +118,9 @@ void EditorInspectorPluginGradient::parse_begin(Object *p_object) {
editor->set_gradient(g);
add_custom_control(editor);
int picker_shape = EDITOR_GET("interface/inspector/default_color_picker_shape");
editor->get_picker()->set_picker_shape((ColorPicker::PickerShapeType)picker_shape);
reverse_btn = memnew(GradientReverseButton);
gradient_tools_hbox = memnew(HBoxContainer);

4
scene/gui/gradient_edit.cpp
View file

@ -432,6 +432,10 @@ Gradient::InterpolationMode GradientEdit::get_interpolation_mode() {
return interpolation_mode;
}
ColorPicker *GradientEdit::get_picker() {
return picker;
}
void GradientEdit::_bind_methods() {
ADD_SIGNAL(MethodInfo("ramp_changed"));
}

1
scene/gui/gradient_edit.h
View file

@ -75,6 +75,7 @@ public:
Vector<Gradient::Point> &get_points();
void set_interpolation_mode(Gradient::InterpolationMode p_interp_mode);
Gradient::InterpolationMode get_interpolation_mode();
ColorPicker *get_picker();
virtual Size2 get_minimum_size() const override;