Merge pull request #3 from Shakshi3104/fixes

Fix the issue of cutting off edges on > 8 cores Mac

Author: Shakshi3104

Gaufre.xcodeproj/project.pbxproj

@@ -10,6 +10,7 @@
 		CE42C03027535B8C00FC7ECF /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE42C02F27535B8C00FC7ECF /* AppDelegate.swift */; };
 		CE42C03427535B8E00FC7ECF /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = CE42C03327535B8E00FC7ECF /* Assets.xcassets */; };
 		CE42C03727535B8E00FC7ECF /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = CE42C03527535B8E00FC7ECF /* Main.storyboard */; };
+		CE99077C279D12B60085608B /* DebugWafersView.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE99077B279D12B60085608B /* DebugWafersView.swift */; };
 		CEB1351F278A69F9002318CA /* CoreWafer in Frameworks */ = {isa = PBXBuildFile; productRef = CEB1351E278A69F9002318CA /* CoreWafer */; };
 /* End PBXBuildFile section */
 
@@ -21,6 +22,7 @@
 		CE42C03827535B8E00FC7ECF /* Gaufre.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Gaufre.entitlements; sourceTree = "<group>"; };
 		CE42C03E27535C5D00FC7ECF /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
 		CE42C05727537E9400FC7ECF /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
+		CE99077B279D12B60085608B /* DebugWafersView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DebugWafersView.swift; sourceTree = "<group>"; };
 		CECC6F152754679B0001E388 /* gaufre.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = gaufre.gif; sourceTree = "<group>"; };
 		CECC6F1727546A090001E388 /* gaufre-icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "gaufre-icon.png"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@@ -63,6 +65,7 @@
 				CE42C03327535B8E00FC7ECF /* Assets.xcassets */,
 				CE42C03527535B8E00FC7ECF /* Main.storyboard */,
 				CE42C03827535B8E00FC7ECF /* Gaufre.entitlements */,
+				CE99077B279D12B60085608B /* DebugWafersView.swift */,
 			);
 			path = Gaufre;
 			sourceTree = "<group>";
@@ -152,6 +155,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				CE99077C279D12B60085608B /* DebugWafersView.swift in Sources */,
 				CE42C03027535B8C00FC7ECF /* AppDelegate.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;

Gaufre.xcodeproj/xcuserdata/user.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -9,6 +9,11 @@
 			<key>orderHint</key>
 			<integer>0</integer>
 		</dict>
+		<key>debug.xcscheme_^#shared#^_</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>1</integer>
+		</dict>
 	</dict>
 	<key>SuppressBuildableAutocreation</key>
 	<dict>

Gaufre/AppDelegate.swift

@@ -8,6 +8,7 @@
 import Cocoa
 import SwiftUI
 import CoreWafer
+import DeviceHardware
 
 @main
 class AppDelegate: NSObject, NSApplicationDelegate {
@@ -42,12 +43,25 @@ class AppDelegate: NSObject, NSApplicationDelegate {
             statusBarButton.target = self
         }
 
-        // Each core load view        
-        let waftersView = NSHostingView(rootView: WafersView(processor: processor) .scaleEffect(0.55))
-        waftersView.frame = NSRect(x: 0, y: 0, width: 200, height: 100)
+        // Each core load view
+        let wafersView: NSView
+        let coreCount: Int
+        
+        #if DEBUG
+        coreCount = 56
+        wafersView = NSHostingView(rootView: DebugWafersView(coreCount: coreCount) .scaleEffect(0.55))
+        #else
+        coreCount = MacDeviceHardware.deviceHardware.processorCount
+        wafersView = NSHostingView(rootView: WafersView(processor: processor) .scaleEffect(0.55))
+        #endif
+        
+        let width = coreCount < 30 ? 20 * coreCount + 40 : 20 * coreCount / 2 + 40
+        let height = coreCount < 30 ? 100 : 160
+        
+        wafersView.frame = NSRect(x: 0, y: 0, width: width, height: height)
 
         let coreInfoItem = NSMenuItem()
-        coreInfoItem.view = waftersView
+        coreInfoItem.view = wafersView
 
         // main menu
         let mainMenu = NSMenu()

Gaufre/DebugWafersView.swift

@@ -0,0 +1,65 @@
+//
+//  DebugProcessorObserver.swift
+//  Gaufre
+//
+//  Created by MacBook Pro M1 on 2022/01/23.
+//
+
+import SwiftUI
+
+#if DEBUG
+struct DebugWafersView: View {
+    var coreCount: Int
+    
+    var body: some View {
+        if coreCount < 30 {
+            HStack(alignment: .bottom) {
+                ForEach(0..<coreCount) { _ in
+                    let coreUsage = Double.random(in: 0.0...99.9)
+                    
+                    BarView(value: coreUsage)
+                }
+            }
+            .padding(20)
+        } else {
+            VStack {
+                HStack(alignment: .bottom) {
+                    ForEach(0..<coreCount / 2) { _ in
+                        let coreUsage = Double.random(in: 0.0...99.9)
+                        
+                        BarView(value: coreUsage)
+                    }
+                }
+                
+                HStack(alignment: .bottom) {
+                    ForEach(coreCount / 2 ..< coreCount) { _ in
+                        let coreUsage = Double.random(in: 0.0...99.9)
+                        
+                        BarView(value: coreUsage)
+                    }
+                }
+            }
+            .padding(20)
+        }
+    }
+}
+
+struct BarView: View {
+    var value: CGFloat
+    var maxValue: CGFloat = 120
+    var color = Color(.sRGB, red: 0.2, green: 0.5, blue: 0.8)
+    
+    var body: some View {
+        VStack {
+            ZStack(alignment: .bottom) {
+                RoundedRectangle(cornerRadius: 5)
+                    .frame(width: 30, height: maxValue)
+                    .foregroundColor(.secondary.opacity(0.2))
+                RoundedRectangle(cornerRadius: 5)
+                    .frame(width: 30, height: value)
+                    .foregroundColor(color)
+            }
+        }
+    }
+}
+#endif