Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add BlockingToolbar #43

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 52 additions & 0 deletions macos/Classes/BlockingToolbar.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
//
// BlockingToolbar.swift
// macos_window_utils
//
// Created by Ben Hagen on 12.11.2023.
//

import Foundation
import FlutterMacOS

class BlockingToolbar: NSToolbar, NSToolbarDelegate {
let flutterView: FlutterViewController

init(flutterView: FlutterViewController) {
self.flutterView = flutterView
super.init(identifier: "BlockingToolbar")
}

func toolbarDefaultItemIdentifiers(_ toolbar: NSToolbar) -> [NSToolbarItem.Identifier] {
[.flexibleSpace, NSToolbarItem.Identifier("BlockingItem")]
}

func toolbarAllowedItemIdentifiers(_ toolbar: NSToolbar) -> [NSToolbarItem.Identifier] {
toolbarDefaultItemIdentifiers(toolbar)
}

func toolbar(_ toolbar: NSToolbar, itemForItemIdentifier itemIdentifier: NSToolbarItem.Identifier, willBeInsertedIntoToolbar flag: Bool) -> NSToolbarItem? {
if itemIdentifier == NSToolbarItem.Identifier("BlockingItem") {
let item = NSToolbarItem(itemIdentifier: itemIdentifier)
let view = ForwardingView()
view.flutterView = flutterView
view.widthAnchor.constraint(lessThanOrEqualToConstant: 100000).isActive = true
view.widthAnchor.constraint(greaterThanOrEqualToConstant: 1).isActive = true
item.view = view
return item
}
return nil
}
}


class ForwardingView: NSView {
var flutterView: FlutterViewController?

override func mouseDown(with event: NSEvent) {
flutterView!.mouseDown(with: event)
}

override func mouseUp(with event: NSEvent) {
flutterView!.mouseUp(with: event)
}
}
7 changes: 4 additions & 3 deletions macos/Classes/MainFlutterWindowManipulator.swift
Original file line number Diff line number Diff line change
Expand Up @@ -402,9 +402,10 @@ public class MainFlutterWindowManipulator {
}

if #available(macOS 10.13, *) {
let newToolbar = NSToolbar()

self.mainFlutterWindow!.toolbar = newToolbar
let customToolbar = BlockingToolbar(flutterView: (self.mainFlutterWindow?.contentViewController as! MacOSWindowUtilsViewController).flutterViewController)
customToolbar.showsBaselineSeparator = false
customToolbar.delegate = customToolbar
self.mainFlutterWindow!.toolbar = customToolbar
}
}

Expand Down