Zaph/AdwaitaWebViewSwift
1
2
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix up Toolbar

Browse Source
This commit is contained in:
Zaphhh 2024-10-17 18:15:17 +01:00
parent 8bf6f3c33f
commit ce9d95bc7a
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Tests/main.swift
View File

@ -2,27 +2,28 @@ import Adwaita
import WebView import WebView
@main @main
struct Test: App{ struct Test: App {
let id = "xyz.zaph.webview" let id = "xyz.zaph.webview"
var app: AdwaitaApp! var app: AdwaitaApp!
@State private var url: String = "https://github.com/AparokshaUI/adwaita-swift" @State private var url: String = "https://github.com/AparokshaUI/adwaita-swift"
var scene: Scene { var scene: Scene {
Window(id: "main"){ window in Window(id: "main") { window in
WebView(url: $url) WebView(url: $url)
.setSize(width: 800, height: 600) .setSize(width: 800, height: 600)
.topToolbar { .topToolbar {
ToolbarView(app: app) ToolbarView(app: app, window: window)
} }
} }
} }
} }
struct ToolbarView: View { struct ToolbarView: View {
@State private var about = false @State private var about = false
var app: AdwaitaApp var app: AdwaitaApp
var window: AdwaitaWindow
var view: Body { var view: Body {
HeaderBar.end { HeaderBar.end {
@ -32,9 +33,13 @@ struct ToolbarView: View {
} }
.keyboardShortcut("n".ctrl()) .keyboardShortcut("n".ctrl())
MenuButton("Close Window") { MenuButton("Close Window") {
app.quit() window.close()
} }
.keyboardShortcut("w".ctrl()) .keyboardShortcut("w".ctrl())
MenuButton("Close App") {
app.quit()
}
.keyboardShortcut("q".ctrl())
MenuSection { MenuSection {
MenuButton("About Me", window: false) { MenuButton("About Me", window: false) {
about = true about = true
@ -53,7 +58,7 @@ struct ToolbarView: View {
issues: .init(string: "https://github.com/Zaphik/AdwaitaWebViewSwift")! issues: .init(string: "https://github.com/Zaphik/AdwaitaWebViewSwift")!
) )
} }
} }
} }