godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #68255 from jbcolli2/ColorPickerBug

Browse Source 
Fixed Issue #68194 involving ColorPicker being allowed to align horizontally when it shouldn't
This commit is contained in:
Rémi Verschelde 2022-12-21 22:25:14 +01:00
commit b04bc49443
No known key found for this signature in database
GPG Key ID: C3336907360768E1
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/classes/ColorPicker.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<class name="ColorPicker" inherits="BoxContainer" version="4.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd"> <class name="ColorPicker" inherits="VBoxContainer" version="4.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
<brief_description> <brief_description>
Color picker control. Color picker control.
</brief_description> </brief_description>
@ -88,7 +88,6 @@
<member name="sliders_visible" type="bool" setter="set_sliders_visible" getter="are_sliders_visible" default="true"> <member name="sliders_visible" type="bool" setter="set_sliders_visible" getter="are_sliders_visible" default="true">
If [code]true[/code], the color sliders are visible. If [code]true[/code], the color sliders are visible.
</member> </member>
<member name="vertical" type="bool" setter="set_vertical" getter="is_vertical" overrides="BoxContainer" default="true" />
</members> </members>
<signals> <signals>
<signal name="color_changed"> <signal name="color_changed">

3
scene/gui/color_picker.cpp
View File

@ -1577,8 +1577,7 @@ void ColorPicker::_bind_methods() {
BIND_ENUM_CONSTANT(SHAPE_NONE); BIND_ENUM_CONSTANT(SHAPE_NONE);
} }
ColorPicker::ColorPicker() : ColorPicker::ColorPicker() {
BoxContainer(true) {
HBoxContainer *hb_edit = memnew(HBoxContainer); HBoxContainer *hb_edit = memnew(HBoxContainer);
add_child(hb_edit, false, INTERNAL_MODE_FRONT); add_child(hb_edit, false, INTERNAL_MODE_FRONT);
hb_edit->set_v_size_flags(SIZE_SHRINK_BEGIN); hb_edit->set_v_size_flags(SIZE_SHRINK_BEGIN);

4
scene/gui/color_picker.h
View File

@ -68,8 +68,8 @@ public:
~ColorPresetButton(); ~ColorPresetButton();
}; };
class ColorPicker : public BoxContainer { class ColorPicker : public VBoxContainer {
GDCLASS(ColorPicker, BoxContainer); GDCLASS(ColorPicker, VBoxContainer);
public: public:
enum ColorModeType { enum ColorModeType {