Refactored RadioGroup to just use Commands

tig · tig · commit ea7417983321 · 2024-12-09T22:56:19.000-08:00
diff --git a/Terminal.Gui/Views/RadioGroup.cs b/Terminal.Gui/Views/RadioGroup.cs
@@ -36,8 +36,6 @@ public RadioGroup ()
         // ReSharper disable once UseObjectOrCollectionInitializer
         _orientationHelper = new (this);
         _orientationHelper.Orientation = Orientation.Vertical;
-        _orientationHelper.OrientationChanging += (sender, e) => OrientationChanging?.Invoke (this, e);
-        _orientationHelper.OrientationChanged += (sender, e) => OrientationChanged?.Invoke (this, e);
 
         SetupKeyBindings ();
 
@@ -353,11 +351,7 @@ protected override bool OnDrawingContent ()
 
                     if (j == hotPos && i == Cursor)
                     {
-                        SetAttribute (
-                                                          HasFocus
-                                                              ? ColorScheme!.HotFocus
-                                                              : GetHotNormalColor ()
-                                                         );
+                        SetAttribute (HasFocus ? GetHotFocusColor() : GetHotNormalColor ());
                     }
                     else if (j == hotPos && i != Cursor)
                     {
@@ -375,11 +369,7 @@ protected override bool OnDrawingContent ()
 
                         if (i == Cursor)
                         {
-                            SetAttribute (
-                                                              HasFocus
-                                                                  ? ColorScheme!.HotFocus
-                                                                  : GetHotNormalColor ()
-                                                             );
+                            SetAttribute (HasFocus ? GetHotFocusColor() : GetHotNormalColor ());
                         }
                         else if (i != Cursor)
                         {

Original file line number	Diff line number	Diff line change
`@@ -36,8 +36,6 @@ public RadioGroup ()`
`36`	`36`	`// ReSharper disable once UseObjectOrCollectionInitializer`
`37`	`37`	`_orientationHelper = new (this);`
`38`	`38`	`_orientationHelper.Orientation = Orientation.Vertical;`
`39`		`- _orientationHelper.OrientationChanging += (sender, e) => OrientationChanging?.Invoke (this, e);`
`40`		`- _orientationHelper.OrientationChanged += (sender, e) => OrientationChanged?.Invoke (this, e);`
`41`	`39`
`42`	`40`	`SetupKeyBindings ();`
`43`	`41`
`@@ -353,11 +351,7 @@ protected override bool OnDrawingContent ()`
`353`	`351`
`354`	`352`	`if (j == hotPos && i == Cursor)`
`355`	`353`	`{`
`356`		`- SetAttribute (`
`357`		`- HasFocus`
`358`		`- ? ColorScheme!.HotFocus`
`359`		`- : GetHotNormalColor ()`
`360`		`- );`
	`354`	`+ SetAttribute (HasFocus ? GetHotFocusColor() : GetHotNormalColor ());`
`361`	`355`	`}`
`362`	`356`	`else if (j == hotPos && i != Cursor)`
`363`	`357`	`{`
`@@ -375,11 +369,7 @@ protected override bool OnDrawingContent ()`
`375`	`369`
`376`	`370`	`if (i == Cursor)`
`377`	`371`	`{`
`378`		`- SetAttribute (`
`379`		`- HasFocus`
`380`		`- ? ColorScheme!.HotFocus`
`381`		`- : GetHotNormalColor ()`
`382`		`- );`
	`372`	`+ SetAttribute (HasFocus ? GetHotFocusColor() : GetHotNormalColor ());`
`383`	`373`	`}`
`384`	`374`	`else if (i != Cursor)`
`385`	`375`	`{`