godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-17 14:11:06 +00:00
Code Releases Wiki Activity

Allow all ColorPicker Shapes to expand horizontally

Browse Source 
Co-authored-by: Tomasz Chabora <kobewi4e@gmail.com>
This commit is contained in:
Mounir Tohami
2025-09-04 01:17:16 +03:00
parent 6efa557e9b
commit b22e266d71
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scene/gui/color_picker.cpp
View File

@@ -2162,7 +2162,7 @@ ColorPicker::ColorPicker() {
internal_margin->add_child(real_vbox); internal_margin->add_child(real_vbox);
shape_container = memnew(HBoxContainer); shape_container = memnew(HBoxContainer);
shape_container->set_v_size_flags(SIZE_SHRINK_BEGIN); shape_container->set_alignment(ALIGNMENT_CENTER);
real_vbox->add_child(shape_container); real_vbox->add_child(shape_container);
sample_hbc = memnew(HBoxContainer); sample_hbc = memnew(HBoxContainer);

2
scene/gui/color_picker_shape.cpp
View File

@@ -322,6 +322,7 @@ void ColorPickerShapeRectangle::_hue_slider_draw() {
void ColorPickerShapeRectangle::_initialize_controls() { void ColorPickerShapeRectangle::_initialize_controls() {
sv_square = memnew(Control); sv_square = memnew(Control);
sv_square->set_h_size_flags(Control::SIZE_EXPAND_FILL);
color_picker->shape_container->add_child(sv_square); color_picker->shape_container->add_child(sv_square);
sv_square->connect(SceneStringName(gui_input), callable_mp(this, &ColorPickerShapeRectangle::_sv_square_input)); sv_square->connect(SceneStringName(gui_input), callable_mp(this, &ColorPickerShapeRectangle::_sv_square_input));
sv_square->connect(SceneStringName(draw), callable_mp(this, &ColorPickerShapeRectangle::_sv_square_draw)); sv_square->connect(SceneStringName(draw), callable_mp(this, &ColorPickerShapeRectangle::_sv_square_draw));
@@ -358,6 +359,7 @@ void ColorPickerShapeRectangle::grab_focus() {
void ColorPickerShapeOKHSRectangle::_initialize_controls() { void ColorPickerShapeOKHSRectangle::_initialize_controls() {
rectangle_margin = memnew(MarginContainer); rectangle_margin = memnew(MarginContainer);
rectangle_margin->set_h_size_flags(Control::SIZE_EXPAND_FILL);
color_picker->shape_container->add_child(rectangle_margin); color_picker->shape_container->add_child(rectangle_margin);
Ref<ShaderMaterial> material; Ref<ShaderMaterial> material;