Skip to content
Merged
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
23 changes: 15 additions & 8 deletions macos/TinyBoard/Styles/MenuItemButtonStyle.swift
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,12 @@

import SwiftUI

struct MenuItemButtonStyle: ButtonStyle {
import AppKit

@Environment(\.isEnabled) private var isEnabled: Bool
struct MenuItemButtonStyle: PrimitiveButtonStyle {

@Environment(\.dismissWindow) private var dismissWindow
@Environment(\.isEnabled) private var isEnabled

@State var hover = false

Expand All @@ -39,18 +42,22 @@ struct MenuItemButtonStyle: ButtonStyle {
.foregroundColor(foregroundColor)
.padding([.leading, .trailing], 12)
.padding([.top, .bottom], 4)
.background(RoundedRectangle(cornerRadius: 4.0)
.fill(.primary.opacity(hover && isEnabled ? 0.2 : 0.0)))
.onHover { hover in
self.hover = hover
}
Spacer()
}
.background(RoundedRectangle(cornerRadius: 4.0)
.fill(.primary.opacity(hover && isEnabled ? 0.2 : 0.0)))
.onHover { hover in
self.hover = hover
}
.onTapGesture {
configuration.trigger()
dismissWindow()
}
}

}

extension ButtonStyle where Self == MenuItemButtonStyle {
extension PrimitiveButtonStyle where Self == MenuItemButtonStyle {

static var menuItem: MenuItemButtonStyle {
return MenuItemButtonStyle()
Expand Down
2 changes: 0 additions & 2 deletions macos/TinyBoard/TinyBoardApp.swift
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@ struct TinyBoardApp: App {
let model = ApplicationModel()

var body: some Scene {

InputMenu(model: model)

}
}
17 changes: 2 additions & 15 deletions macos/TinyBoard/Views/InputMenuContent.swift
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ import Interact

struct InputMenuContent: View {

@Environment(\.dismissWindow) private var dismissWindow

@ObservedObject var model: ApplicationModel
@State var openAtLogin = false

Expand Down Expand Up @@ -61,27 +59,16 @@ struct InputMenuContent: View {

MenuSection {
UpdateLink(updater: model.updaterController.updater)
.frame(maxWidth: .infinity, alignment: .leading)
.simultaneousGesture(TapGesture().onEnded {
dismissWindow()
})
}

MenuDivider()

MenuSection {
Button {
dismissWindow()
Button("About") {
model.showAbout()
} label: {
Text("About")
.horizontalSpace(.trailing)
}
Button {
Button("Quit") {
NSApplication.shared.terminate(nil)
} label: {
Text("Quit")
.horizontalSpace(.trailing)
}
}

Expand Down