From c685c47f8a9df73f51afac7ec20bcd4caf149cee Mon Sep 17 00:00:00 2001 From: jbcolli2 Date: Fri, 4 Nov 2022 09:46:13 -0400 Subject: Fixed ColorPicker so the vertical option is not available in editor. --- scene/gui/color_picker.cpp | 3 +-- scene/gui/color_picker.h | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'scene/gui') diff --git a/scene/gui/color_picker.cpp b/scene/gui/color_picker.cpp index a2c138c0b2..2ff3758d4c 100644 --- a/scene/gui/color_picker.cpp +++ b/scene/gui/color_picker.cpp @@ -1529,8 +1529,7 @@ void ColorPicker::_bind_methods() { BIND_ENUM_CONSTANT(SHAPE_OKHSL_CIRCLE); } -ColorPicker::ColorPicker() : - BoxContainer(true) { +ColorPicker::ColorPicker() { HBoxContainer *hb_edit = memnew(HBoxContainer); add_child(hb_edit, false, INTERNAL_MODE_FRONT); hb_edit->set_v_size_flags(SIZE_SHRINK_BEGIN); diff --git a/scene/gui/color_picker.h b/scene/gui/color_picker.h index 6c91575893..dc27cb9ddb 100644 --- a/scene/gui/color_picker.h +++ b/scene/gui/color_picker.h @@ -68,8 +68,8 @@ public: ~ColorPresetButton(); }; -class ColorPicker : public BoxContainer { - GDCLASS(ColorPicker, BoxContainer); +class ColorPicker : public VBoxContainer { + GDCLASS(ColorPicker, VBoxContainer); public: enum ColorModeType { -- cgit v1.2.3