✨ #49 Initial support resize icons in menubar resize items

MrKai77 · Oct 9, 2023 · 46735c3 · 46735c3
1 parent 6e23656
commit 46735c3
Show file tree

Hide file tree

Showing 9 changed files with 531 additions and 0 deletions.
diff --git a/Loop/Assets.xcassets/SF Symbols/Window Resize/Contents.json b/Loop/Assets.xcassets/SF Symbols/Window Resize/Contents.json
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/...ssets/SF Symbols/Window Resize/rectangle.centerthird.inset.filled.symbolset/Contents.json b/...ssets/SF Symbols/Window Resize/rectangle.centerthird.inset.filled.symbolset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "symbols" : [
+    {
+      "filename" : "rectangle.centerthird.inset.filled.svg",
+      "idiom" : "universal"
+    }
+  ]
+}
diff --git a/...angle.centerthird.inset.filled.symbolset/rectangle.centerthird.inset.filled.svg b/...angle.centerthird.inset.filled.symbolset/rectangle.centerthird.inset.filled.svg
diff --git a/...ets/SF Symbols/Window Resize/rectangle.lefttwothirds.inset.filled.symbolset/Contents.json b/...ets/SF Symbols/Window Resize/rectangle.lefttwothirds.inset.filled.symbolset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "symbols" : [
+    {
+      "filename" : "rectangle.lefttwothirds.inset.filled.svg",
+      "idiom" : "universal"
+    }
+  ]
+}
diff --git a/...e.lefttwothirds.inset.filled.symbolset/rectangle.lefttwothirds.inset.filled.svg b/...e.lefttwothirds.inset.filled.symbolset/rectangle.lefttwothirds.inset.filled.svg
diff --git a/...ts/SF Symbols/Window Resize/rectangle.righttwothirds.inset.filled.symbolset/Contents.json b/...ts/SF Symbols/Window Resize/rectangle.righttwothirds.inset.filled.symbolset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "symbols" : [
+    {
+      "filename" : "rectangle.righttwothirds.inset.filled.svg",
+      "idiom" : "universal"
+    }
+  ]
+}
diff --git a/...righttwothirds.inset.filled.symbolset/rectangle.righttwothirds.inset.filled.svg b/...righttwothirds.inset.filled.symbolset/rectangle.righttwothirds.inset.filled.svg
diff --git a/Loop/MenuBarResizeButton.swift b/Loop/MenuBarResizeButton.swift
@@ -23,6 +23,9 @@ struct MenuBarResizeButton: View {
                 }
             } label: {
                 HStack {
+                    if let image = direction.image {
+                        Image(nsImage: image)
+                    }
                     Text(name)
                 }
             }

diff --git a/Loop/Window Management/WindowDirection.swift b/Loop/Window Management/WindowDirection.swift
@@ -156,6 +156,39 @@ enum WindowDirection: CaseIterable, Identifiable {
         }
     }
 
+    var image: NSImage? {
+        switch self {
+        case .maximize:                 NSImage(systemSymbolName: "rectangle.inset.filled", accessibilityDescription: nil)
+        case .fullscreen:               NSImage(systemSymbolName: "rectangle.fill", accessibilityDescription: nil)
+//        case .lastDirection:
+        case .center:                   NSImage(systemSymbolName: "rectangle.center.inset.filled", accessibilityDescription: nil)
+        case .initialFrame:             NSImage(systemSymbolName: "macwindow", accessibilityDescription: nil)
+
+        case .topHalf:                  NSImage(systemSymbolName: "rectangle.tophalf.inset.filled", accessibilityDescription: nil)
+        case .rightHalf:                NSImage(systemSymbolName: "rectangle.righthalf.inset.filled", accessibilityDescription: nil)
+        case .bottomHalf:               NSImage(systemSymbolName: "rectangle.bottomhalf.inset.filled", accessibilityDescription: nil)
+        case .leftHalf:                 NSImage(systemSymbolName: "rectangle.lefthalf.inset.filled", accessibilityDescription: nil)
+
+        case .topLeftQuarter:           NSImage(systemSymbolName: "rectangle.inset.topleft.filled", accessibilityDescription: nil)
+        case .topRightQuarter:          NSImage(systemSymbolName: "rectangle.inset.topright.filled", accessibilityDescription: nil)
+        case .bottomRightQuarter:       NSImage(systemSymbolName: "rectangle.inset.bottomright.filled", accessibilityDescription: nil)
+        case .bottomLeftQuarter:        NSImage(systemSymbolName: "rectangle.inset.bottomleft.filled", accessibilityDescription: nil)
+
+        case .rightThird:               NSImage(systemSymbolName: "rectangle.rightthird.inset.filled", accessibilityDescription: nil)
+        case .rightTwoThirds:           NSImage(named: "rectangle.righttwothirds.inset.filled")
+        case .horizontalCenterThird:    NSImage(named: "rectangle.centerthird.inset.filled")
+        case .leftThird:                NSImage(systemSymbolName: "rectangle.leftthird.inset.filled", accessibilityDescription: nil)
+        case .leftTwoThirds:            NSImage(named: "rectangle.lefttwothirds.inset.filled")
+
+        case .topThird:                 NSImage(systemSymbolName: "rectangle.topthird.inset.filled", accessibilityDescription: nil)
+//        case .topTwoThirds:
+//        case .verticalCenterThird:
+        case .bottomThird:              NSImage(systemSymbolName: "rectangle.bottomthird.inset.filled", accessibilityDescription: nil)
+//        case .bottomTwoThirds:
+        default:                        nil
+        }
+    }
+
     var edgesTouchingScreen: [Edge] {
         switch self {
         case .maximize:                 [.top, .bottom, .leading, .trailing]