Skip to content

fix: closes the color picker when you click outside of its bounds #186

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
birbattac wants to merge 8 commits into from
Closed

fix: closes the color picker when you click outside of its bounds #186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f17ba0d
added custom space color setting
birbattac Oct 15, 2026
fa5738e
removed some logs
birbattac Oct 15, 2026
7bd60f4
formatted + csharpier
birbattac Oct 15, 2026
f16699d
Simplified a few conditionals, disabled settings template, and added …
birbattac Oct 19, 2026
ed8aa2f
switched the space color setting to use a godot color picker and adde…
birbattac Oct 19, 2026
3e84903
formatting and csharpier
birbattac Oct 20, 2026
4e47c8b
Clicking outside of the colorpicker now closes the colorpicker
birbattac Oct 26, 2026
3a07785
Merge branch 'indev' into space-color
birbattac Oct 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion scenes/main.tscn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,11 +342,28 @@ theme_override_font_sizes/font_size = 12
text = "Pick Color"
clip_text = true

[node name="ColorPicker" type="ColorPicker" parent="Settings/Holder/Categories/CategoryTemplate/Container/SettingTemplate" unique_id=1549088178]
[node name="PickerHide" type="Button" parent="Settings/Holder/Categories/CategoryTemplate/Container/SettingTemplate" unique_id=1783564195]
visible = false
self_modulate = Color(1, 1, 1, 0)
top_level = true
z_index = 1
layout_mode = 1
anchors_preset = 15
anchor_right = 1.0
anchor_bottom = 1.0
offset_left = 2.0
offset_top = -1.0
offset_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
action_mode = 0
button_mask = 3

[node name="ColorPicker" type="ColorPicker" parent="Settings/Holder/Categories/CategoryTemplate/Container/SettingTemplate" unique_id=1549088178]
visible = false
top_level = true
z_index = 2
layout_mode = 1
anchors_preset = -1
anchor_left = 0.553
anchor_top = 0.33
Expand Down
16 changes: 14 additions & 2 deletions scripts/ui/SettingsMenu.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ public override void _Ready()
Button buttonTemplate = buttonHboxTemplate.GetNode<Button>("Button");
Button colorButtonTemplate = settingTemplate.GetNode<Button>("ColorButton");
ColorPicker colorPickerTemplate = settingTemplate.GetNode<ColorPicker>("ColorPicker");
Button hidePickerTemplate = settingTemplate.GetNode<Button>("PickerHide");

settingTemplate.Visible = false;

Expand Down Expand Up @@ -182,10 +183,12 @@ public override void _Ready()
{
Button colorButton = colorButtonTemplate.Duplicate() as Button;
ColorPicker picker = colorPickerTemplate.Duplicate() as ColorPicker;
Button pickerHider = hidePickerTemplate.Duplicate() as Button;

setupColorPicker(setting, colorButton, picker);
setupColorPicker(setting, colorButton, picker, pickerHider);
panel.AddChild(colorButton);
panel.AddChild(picker);
panel.AddChild(pickerHider);
}
else if (setting.List != null)
{
Expand Down Expand Up @@ -528,7 +531,7 @@ private static void setupButton(SettingsButton setting, Button button)
};
}

private static void setupColorPicker(ISettingsItem setting, Button button, ColorPicker picker)
private static void setupColorPicker(ISettingsItem setting, Button button, ColorPicker picker, Button hideButton)
{
button.TooltipText = setting.Description;
Logger.Log(setting.GetVariant().ToString());
Expand All @@ -537,6 +540,15 @@ private static void setupColorPicker(ISettingsItem setting, Button button, Color
button.Pressed += () =>
{
picker.Visible = !picker.Visible;
if (picker.Visible)
{
hideButton.Visible = true;
}
};
hideButton.Pressed += () =>
{
picker.Visible = false;
hideButton.Visible = false;
};
button.VisibilityChanged += () =>
{
Expand Down
Loading