Merge pull request #110581 from KoBeWi/round_like_earth

Fix color picker shape minimum size

Author: Repiteo

scene/gui/color_picker_shape.cpp

@@ -807,27 +807,24 @@ void ColorPickerShapeWheel::_wheel_uv_draw() {
 }
 
 void ColorPickerShapeWheel::_initialize_controls() {
-	wheel_margin = memnew(MarginContainer);
-	color_picker->shape_container->add_child(wheel_margin);
-
 	Ref<ShaderMaterial> material;
 	material.instantiate();
 	material->set_shader(ColorPickerShape::wheel_shader);
 	material->set_shader_parameter("wheel_radius", WHEEL_RADIUS);
 
 	wheel = memnew(Control);
 	wheel->set_material(material);
-	wheel_margin->add_child(wheel);
+	color_picker->shape_container->add_child(wheel);
 	wheel->connect(SceneStringName(draw), callable_mp(this, &ColorPickerShapeWheel::_wheel_draw));
 
 	wheel_uv = memnew(Control);
-	wheel_margin->add_child(wheel_uv);
+	wheel_uv->set_anchors_and_offsets_preset(Control::PRESET_FULL_RECT);
+	wheel->add_child(wheel_uv);
 	wheel_uv->connect(SceneStringName(focus_entered), callable_mp(this, &ColorPickerShapeWheel::_reset_wheel_focus));
 	wheel_uv->connect(SceneStringName(gui_input), callable_mp(this, &ColorPickerShapeWheel::_wheel_input));
 	wheel_uv->connect(SceneStringName(draw), callable_mp(this, &ColorPickerShapeWheel::_wheel_uv_draw));
 	connect_shape_focus(wheel_uv);
 
-	controls.append(wheel_margin);
 	controls.append(wheel);
 	controls.append(wheel_uv);
 }
@@ -848,8 +845,7 @@ void ColorPickerShapeWheel::_update_cursor(const Vector2 &p_color_change_vector,
 
 void ColorPickerShapeWheel::update_theme() {
 	const ColorPicker::ThemeCache &theme_cache = color_picker->theme_cache;
-	wheel_margin->set_custom_minimum_size(Size2(theme_cache.sv_width, theme_cache.sv_height));
-	wheel_margin->add_theme_constant_override(SNAME("margin_bottom"), 8 * theme_cache.base_scale);
+	wheel->set_custom_minimum_size(Size2(theme_cache.sv_width, theme_cache.sv_height));
 }
 
 void ColorPickerShapeWheel::grab_focus() {
@@ -877,16 +873,13 @@ void ColorPickerShapeCircle::update_circle_cursor(const Vector2 &p_color_change_
 }
 
 void ColorPickerShapeCircle::_initialize_controls() {
-	circle_margin = memnew(MarginContainer);
-	color_picker->shape_container->add_child(circle_margin);
-
 	Ref<ShaderMaterial> material;
 	material.instantiate();
 	material->set_shader(_get_shader());
 
 	circle = memnew(Control);
 	circle->set_material(material);
-	circle_margin->add_child(circle);
+	color_picker->shape_container->add_child(circle);
 	circle->connect(SceneStringName(draw), callable_mp(this, &ColorPickerShapeCircle::_circle_draw));
 
 	circle_overlay = memnew(Control);
@@ -902,16 +895,14 @@ void ColorPickerShapeCircle::_initialize_controls() {
 	value_slider->connect(SceneStringName(draw), callable_mp(this, &ColorPickerShapeCircle::_value_slider_draw));
 	connect_shape_focus(value_slider);
 
-	controls.append(circle_margin);
 	controls.append(circle);
 	controls.append(circle_overlay);
 	controls.append(value_slider);
 }
 
 void ColorPickerShapeCircle::update_theme() {
 	const ColorPicker::ThemeCache &theme_cache = color_picker->theme_cache;
-	circle_margin->set_custom_minimum_size(Size2(theme_cache.sv_width, theme_cache.sv_height));
-	circle_margin->add_theme_constant_override(SNAME("margin_bottom"), 8 * theme_cache.base_scale);
+	circle->set_custom_minimum_size(Size2(theme_cache.sv_width, theme_cache.sv_height));
 	value_slider->set_custom_minimum_size(Size2(theme_cache.h_width, 0));
 }
 

scene/gui/color_picker_shape.h

@@ -172,7 +172,6 @@ class ColorPickerShapeWheel : public ColorPickerShape {
 
 	static constexpr float WHEEL_RADIUS = 0.42;
 
-	MarginContainer *wheel_margin = nullptr;
 	Control *wheel = nullptr;
 	Control *wheel_uv = nullptr;
 
@@ -206,7 +205,6 @@ class ColorPickerShapeCircle : public ColorPickerShape {
 	GDCLASS(ColorPickerShapeCircle, ColorPickerShape);
 
 protected:
-	MarginContainer *circle_margin = nullptr;
 	Control *circle = nullptr;
 	Control *circle_overlay = nullptr;
 	Control *value_slider = nullptr;