Merge pull request #5441 from jnsdrtlf/feature/play-button

Update "Run" icons across the main interface
utmapp · Jul 17, 2023 · dbf5569 · dbf5569
2 parents e15b878 + a2966eb
commit dbf5569
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 10 deletions.
diff --git a/Platform/Shared/VMCardView.swift b/Platform/Shared/VMCardView.swift
@@ -21,10 +21,8 @@ struct VMCardView: View {
     @EnvironmentObject private var data: UTMData
 
     #if os(macOS)
-    let buttonColor: Color = .black
     typealias PlatformImage = NSImage
     #else
-    let buttonColor: Color = .accentColor
     typealias PlatformImage = UIImage
     #endif
 
@@ -51,9 +49,8 @@ struct VMCardView: View {
                 Button {
                     data.run(vm: vm)
                 } label: {
-                    Label("Run", systemImage: "play.circle")
+                    Label("Run", systemImage: "play.circle.fill")
                         .font(.largeTitle)
-                        .foregroundColor(buttonColor)
                         .labelStyle(.iconOnly)
                 }
             } else if vm.isBusy {

diff --git a/Platform/Shared/VMContextMenuModifier.swift b/Platform/Shared/VMContextMenuModifier.swift
@@ -44,21 +44,21 @@ struct VMContextMenuModifier: ViewModifier {
                 Button {
                     confirmAction = .confirmStopVM
                 } label: {
-                    Label("Stop", systemImage: "stop.fill")
+                    Label("Stop", systemImage: "stop")
                 }.help("Stop the running VM.")
             } else if !vm.isModifyAllowed { // paused
                 Button {
                     data.run(vm: vm)
                 } label: {
-                    Label("Resume", systemImage: "playpause.fill")
+                    Label("Resume", systemImage: "playpause")
                 }.help("Resume running VM.")
             } else {
                 Divider()
 
                 Button {
                     data.run(vm: vm)
                 } label: {
-                    Label("Run", systemImage: "play.fill")
+                    Label("Run", systemImage: "play")
                 }.help("Run the VM in the foreground.")
 
                 #if os(macOS) && arch(arm64)
@@ -75,7 +75,7 @@ struct VMContextMenuModifier: ViewModifier {
                     Button {
                         data.run(vm: vm, options: .bootDisposibleMode)
                     } label: {
-                        Label("Run without saving changes", systemImage: "play")
+                        Label("Run without saving changes", systemImage: "memories")
                     }.help("Run the VM in the foreground, without saving data changes to disk.")
                 }
 

diff --git a/Platform/Shared/VMToolbarModifier.swift b/Platform/Shared/VMToolbarModifier.swift
@@ -113,15 +113,15 @@ struct VMToolbarModifier: ViewModifier {
                     Button {
                         confirmAction = .confirmStopVM
                     } label: {
-                        Label("Stop", systemImage: "stop.fill")
+                        Label("Stop", systemImage: "stop")
                             .labelStyle(.iconOnly)
                     }.help("Stop selected VM")
                     .padding(.leading, padding)
                 } else {
                     Button {
                         data.run(vm: data.selectedVM!)
                     } label: {
-                        Label("Run", systemImage: "play.fill")
+                        Label("Run", systemImage: "play")
                             .labelStyle(.iconOnly)
                     }.help("Run selected VM")
                     .padding(.leading, padding)