Skip to content

fix: Clicking outside of the colorpicker now closes the colorpicker #187

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

Merged
nyarw merged 1 commit into from
Oct 27, 2026
Merged

fix: Clicking outside of the colorpicker now closes the colorpicker #187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 15 additions & 1 deletion scenes/main.tscn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,6 +326,21 @@ theme = ExtResource("3_tipki")
theme_override_colors/font_color = Color(1, 1, 1, 1)
text = "Button"

[node name="PickerHide" type="Button" parent="Settings/Holder/Categories/CategoryTemplate/Container/SettingTemplate" unique_id=787866892]
self_modulate = Color(1, 1, 1, 0)
top_level = true
layout_mode = 1
anchors_preset = 15
anchor_right = 1.0
anchor_bottom = 1.0
offset_top = -3.0
offset_right = 4.0
offset_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
action_mode = 0
button_mask = 3

[node name="ColorButton" type="Button" parent="Settings/Holder/Categories/CategoryTemplate/Container/SettingTemplate" unique_id=84045289]
layout_mode = 1
anchors_preset = -1
Expand All @@ -343,7 +358,6 @@ text = "Pick Color"
clip_text = true

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

settingTemplate.Visible = false;
Expand Down Expand Up @@ -182,9 +183,11 @@ public override void _Ready()
{
Button colorButton = colorButtonTemplate.Duplicate() as Button;
ColorPicker picker = colorPickerTemplate.Duplicate() as ColorPicker;
Button pickerHider = pickerHiderTemplate.Duplicate() as Button;

setupColorPicker(setting, colorButton, picker);
setupColorPicker(setting, colorButton, picker, pickerHider);
panel.AddChild(colorButton);
panel.AddChild(pickerHider);
panel.AddChild(picker);
}
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 pickerHider)
{
button.TooltipText = setting.Description;
Logger.Log(setting.GetVariant().ToString());
Expand All @@ -537,10 +540,17 @@ private static void setupColorPicker(ISettingsItem setting, Button button, Color
button.Pressed += () =>
{
picker.Visible = !picker.Visible;
pickerHider.Visible = picker.Visible;
};
button.VisibilityChanged += () =>
{
picker.Visible = false;
pickerHider.Visible = false;
};
pickerHider.Pressed += () =>
{
picker.Visible = false;
pickerHider.Visible = false;
};

picker.ColorChanged += (col) =>
Expand Down
Loading