Procházet zdrojové kódy

Titlebar: widget button placeholder; trim More menu

- Replace grid/launcher control with widget.small icon (fallback
  square.on.square) and empty widgetTapped for future widget work.
- Remove Open in Default Browser from toolbar and overflow menu.
- Remove Copy URL from the More menu and delete copyCurrentURL.

Made-with: Cursor
huzaifahayat12 před 3 měsíci
rodič
revize
c30c30c8a3
1 změnil soubory, kde provedl 11 přidání a 45 odebrání
  1. 11 45
      google_apps/InAppBrowserWindow.swift

+ 11 - 45
google_apps/InAppBrowserWindow.swift

@@ -112,8 +112,7 @@ final class InAppBrowserWindowController: NSWindowController, NSWindowDelegate {
     private var reloadButton: TitlebarIconButton!
     private var pinButton: TitlebarIconButton!
     private var homeButton: TitlebarIconButton!
-    private var gridButton: TitlebarIconButton!
-    private var openInBrowserButton: TitlebarIconButton!
+    private var widgetButton: TitlebarIconButton!
     private var handButton: TitlebarIconButton!
     private var downloadButton: TitlebarIconButton!
     private var moreButton: TitlebarIconButton!
@@ -218,11 +217,12 @@ final class InAppBrowserWindowController: NSWindowController, NSWindowDelegate {
             action: #selector(goHome)
         )
 
-        // Grid (show launcher)
-        gridButton = makeIconButton(
-            symbolName: "square.grid.2x2",
-            accessibility: "Show Launcher",
-            action: #selector(showLauncher)
+        // Widget (placeholder — hook up when widget feature ships)
+        widgetButton = makeIconButton(
+            symbolName: "widget.small",
+            accessibility: "Widget",
+            action: #selector(widgetTapped),
+            fallbackSymbolName: "square.on.square"
         )
 
         // Center site identity (logo + app/site name).
@@ -252,13 +252,6 @@ final class InAppBrowserWindowController: NSWindowController, NSWindowDelegate {
             siteIconView.heightAnchor.constraint(equalToConstant: 14),
         ])
 
-        // Open in external browser
-        openInBrowserButton = makeIconButton(
-            symbolName: "arrow.up.right.square",
-            accessibility: "Open in Browser",
-            action: #selector(openInBrowser)
-        )
-
         // Hand tool (toggle navigation gestures)
         handButton = makeIconButton(
             symbolName: "hand.raised",
@@ -309,8 +302,7 @@ final class InAppBrowserWindowController: NSWindowController, NSWindowDelegate {
         reloadButton.target = self
         pinButton.target = self
         homeButton.target = self
-        gridButton.target = self
-        openInBrowserButton.target = self
+        widgetButton.target = self
         handButton.target = self
         downloadButton.target = self
         moreButton.target = self
@@ -345,8 +337,7 @@ final class InAppBrowserWindowController: NSWindowController, NSWindowDelegate {
 
         let rightStack = NSStackView(views: [
             pinButton,
-            gridButton,
-            openInBrowserButton,
+            widgetButton,
             handButton,
             downloadButton,
             moreButton,
@@ -443,21 +434,12 @@ final class InAppBrowserWindowController: NSWindowController, NSWindowDelegate {
         webView.reload()
     }
 
-    @objc private func openInBrowser() {
-        guard let url = webView.url else { return }
-        NSWorkspace.shared.open(url)
-    }
-
     @objc private func goHome() {
         webView.load(URLRequest(url: initialURL))
     }
 
-    @objc private func showLauncher() {
-        // Bring the main app window (launcher) to front.
-        if let main = NSApp.windows.first {
-            main.makeKeyAndOrderFront(nil)
-        }
-        NSApp.activate(ignoringOtherApps: true)
+    @objc private func widgetTapped() {
+        // Reserved for widget functionality.
     }
 
     @objc private func togglePinOnTop() {
@@ -497,12 +479,6 @@ final class InAppBrowserWindowController: NSWindowController, NSWindowDelegate {
     @objc private func showMoreMenu() {
         let menu = NSMenu()
 
-        let copyURL = NSMenuItem(title: "Copy URL", action: #selector(copyCurrentURL), keyEquivalent: "c")
-        copyURL.keyEquivalentModifierMask = [.command]
-        menu.addItem(copyURL)
-
-        menu.addItem(NSMenuItem.separator())
-
         let reload = NSMenuItem(title: "Reload", action: #selector(reloadPage), keyEquivalent: "r")
         reload.keyEquivalentModifierMask = [.command]
         menu.addItem(reload)
@@ -515,10 +491,6 @@ final class InAppBrowserWindowController: NSWindowController, NSWindowDelegate {
         downloads.keyEquivalentModifierMask = [.command]
         menu.addItem(downloads)
 
-        let openExternal = NSMenuItem(title: "Open in Default Browser", action: #selector(openInBrowser), keyEquivalent: "o")
-        openExternal.keyEquivalentModifierMask = [.command]
-        menu.addItem(openExternal)
-
         menu.addItem(NSMenuItem.separator())
 
         let close = NSMenuItem(title: "Close Window", action: #selector(closeWindowFromMenu), keyEquivalent: "w")
@@ -531,12 +503,6 @@ final class InAppBrowserWindowController: NSWindowController, NSWindowDelegate {
         menu.popUp(positioning: nil, at: location, in: moreButton)
     }
 
-    @objc private func copyCurrentURL() {
-        guard let s = webView.url?.absoluteString, !s.isEmpty else { return }
-        NSPasteboard.general.clearContents()
-        NSPasteboard.general.setString(s, forType: .string)
-    }
-
     @objc private func closeWindowFromMenu() {
         window?.performClose(nil)
     }