use IconButton instead of Option

Author: johncosfm

game/addons/tools/Code/Assets/PreviewSoundFIle.cs

@@ -30,19 +30,14 @@ public override Widget CreateWidget( Widget parent )
 			previewWidget.Play();
 		}
 
-		var autoPlay = previewWidget.ToolBar.AddOption( "Auto-Play", "slideshow" );
-		autoPlay.Toggled = ( value ) =>
+		previewWidget.ToolBar.AddWidget( new IconButton( "slideshow" )
 		{
-			var icon = new Bitmap( 64, 64 );
-			icon.SetFill( Theme.Blue );
-			if ( value )
-				icon.DrawRoundRect( new( 0, 64 ), 8f );
-			icon.DrawText( new( "slideshow", Theme.Text, 56, "Material Icons" ), new( 0, 64 ), TextFlag.Center | TextFlag.DontClip );
-			autoPlay.SetIcon( Pixmap.FromBitmap( icon ) );
-		};
-		autoPlay.Checkable = true;
-		autoPlay.Bind( "Checked" ).From( this, nameof( AutoPlay ) );
-		autoPlay.Toggled.Invoke( AutoPlay );
+			ToolTip = "Auto-Play",
+			IconSize = 18,
+			IsToggle = true,
+			IsActive = AutoPlay,
+			OnToggled = ( value ) => AutoPlay = value
+		} );
 
 		return previewWidget;
 	}

game/addons/tools/Code/Widgets/SoundPlayer/SoundPlayer.cs

@@ -10,7 +10,7 @@ public partial class SoundPlayer : Widget
 
 	public ToolBar ToolBar { get; private set; }
 
-	private readonly Option PlayOption;
+	private readonly IconButton PlayOption;
 
 	private bool _prevPlay = false;
 
@@ -27,7 +27,12 @@ public SoundPlayer( Widget parent ) : base( parent )
 		ToolBar = header.Add( new ToolBar( this ) );
 		ToolBar.NoSystemBackground = false;
 		ToolBar.SetIconSize( 18 );
-		PlayOption = ToolBar.AddOption( "Play", "play_arrow", () => Playing = !Playing );
+		PlayOption = ToolBar.AddWidget( new IconButton( "play_arrow" )
+		{
+			ToolTip = "Play",
+			IconSize = 18,
+			OnClick = () => Playing = !Playing
+		} );
 
 		var timecode = header.Add( new Label( this ) );
 		timecode.Bind( "Text" ).ReadOnly().From( () =>
@@ -38,21 +43,21 @@ public SoundPlayer( Widget parent ) : base( parent )
 		}, null );
 		timecode.Alignment = TextFlag.RightCenter;
 
-		var skipStart = ToolBar.AddOption( "Skip to Start", "skip_previous", () => Timeline.MoveScrubber( 0 ) );
+		ToolBar.AddWidget( new IconButton( "skip_previous" )
+		{
+			ToolTip = "Skip to Start",
+			IconSize = 18,
+			OnClick = () => Timeline.MoveScrubber( 0 )
+		} );
 		ToolBar.AddSeparator();
-		var loop = ToolBar.AddOption( "Loop", "repeat" );
-		loop.Toggled = ( value ) =>
+		ToolBar.AddWidget( new IconButton( "repeat" )
 		{
-			var icon = new Bitmap( 64, 64 );
-			icon.SetFill( Theme.Blue );
-			if ( value )
-				icon.DrawRoundRect( new( 0, 64 ), 8f );
-			icon.DrawText( new( "repeat", Theme.Text, 64, "Material Icons" ), new( 0, 64 ), TextFlag.Center | TextFlag.DontClip );
-			loop.SetIcon( Pixmap.FromBitmap( icon ) );
-		};
-		loop.Bind( "Checked" ).From( this, nameof( Repeating ) );
-		loop.Checkable = true;
-		loop.Toggled.Invoke( Repeating );
+			ToolTip = "Loop",
+			IconSize = 18,
+			IsToggle = true,
+			IsActive = Repeating,
+			OnToggled = ( value ) => Repeating = value
+		} );
 
 		Timeline = Layout.Add( new TimelineView( this ), 1 );
 	}
@@ -89,7 +94,7 @@ protected void OnFrame()
 		Timeline.OnFrame();
 		Time = Timeline.Time;
 
-		PlayOption.Text = Playing ? "Pause" : "Play";
+		PlayOption.ToolTip = Playing ? "Pause" : "Play";
 		PlayOption.Icon = Playing ? "pause" : "play_arrow";
 
 		if ( Application.FocusWidget.IsValid() )