Browse Source

Fixed ColorPicker so the vertical option is not available in editor.

jbcolli2 2 years ago
parent
commit
c685c47f8a
3 changed files with 4 additions and 6 deletions
  1. 1 2
      doc/classes/ColorPicker.xml
  2. 1 2
      scene/gui/color_picker.cpp
  3. 2 2
      scene/gui/color_picker.h

+ 1 - 2
doc/classes/ColorPicker.xml

@@ -1,5 +1,5 @@
 <?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>
 		Color picker control.
 	</brief_description>
@@ -76,7 +76,6 @@
 		<member name="presets_visible" type="bool" setter="set_presets_visible" getter="are_presets_visible" default="true">
 			If [code]true[/code], saved color presets are visible.
 		</member>
-		<member name="vertical" type="bool" setter="set_vertical" getter="is_vertical" overrides="BoxContainer" default="true" />
 	</members>
 	<signals>
 		<signal name="color_changed">

+ 1 - 2
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);

+ 2 - 2
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 {