Skip to content
This repository has been archived by the owner on May 1, 2024. It is now read-only.

[macOS] Fix RadioButton activated behaviour #14139

Merged
merged 3 commits into from
Sep 17, 2021
Merged

[macOS] Fix RadioButton activated behaviour #14139

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
120620d
Respond to Activated event
JunielKatarn Apr 10, 2021
1bd1238
Set initial control state based on element state
JunielKatarn Jun 1, 2021
81d6a82
Revert "Set initial control state based on element state"
JunielKatarn Jun 4, 2021
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
18 changes: 18 additions & 0 deletions Xamarin.Forms.Platform.MacOS/Renderers/RadioButtonRenderer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,12 @@ protected override void Dispose(bool disposing)
{
ObserveStateChange(false);

var formsButton = Control as FormsNSButton;
if (formsButton != null)
{
formsButton.Activated -= HandleActivated;
}

base.Dispose(disposing);
}

Expand All @@ -44,6 +50,8 @@ protected override void OnElementChanged(ElementChangedEventArgs<RadioButton> e)
btn.SetButtonType(NSButtonType.Radio);
SetNativeControl(btn);
ObserveStateChange(true);

btn.Activated += HandleActivated;
}

UpdateContent();
Expand Down Expand Up @@ -156,5 +164,15 @@ void OnStateChanged()

Element.IsChecked = Control.State == NSCellStateValue.On;
}

void HandleActivated(object sender, EventArgs args)
{
if (Element == null || sender == null)
{
return;
}

Element.IsChecked = (sender as FormsNSButton).State == NSCellStateValue.On;
}
}
}