Updated to latest Adwaita for Swift version
This commit is contained in:
parent
b8b7e692cc
commit
46232968f6
|
@ -9,22 +9,20 @@ struct AdwaitaTemplate: App {
|
|||
|
||||
var scene: Scene {
|
||||
Window(id: "main") { window in
|
||||
VStack {
|
||||
VStack(spacing: 8) {
|
||||
Text("Calculations here...")
|
||||
.selectable(false)
|
||||
VStack {
|
||||
HStack {
|
||||
VStack(spacing: 8) {
|
||||
HStack(spacing: 8) {
|
||||
Button("AC") {}
|
||||
.keyboardShortcut("c", app: app)
|
||||
Button("") {}
|
||||
Button("%") {}
|
||||
.keyboardShortcut("%", app: app)
|
||||
.keyboardShortcut("percent", app: app)
|
||||
Button("/") {}
|
||||
.keyboardShortcut("/", app: app)
|
||||
.keyboardShortcut("slash", app: app)
|
||||
}
|
||||
.modifyContent(VStack.self) { $0.spacing(8) }
|
||||
.frame(maxWidth: .none)
|
||||
HStack {
|
||||
HStack(spacing: 8) {
|
||||
Button("7") {}
|
||||
.keyboardShortcut("7", app: app)
|
||||
Button("8") {}
|
||||
|
@ -32,11 +30,9 @@ struct AdwaitaTemplate: App {
|
|||
Button("9") {}
|
||||
.keyboardShortcut("9", app: app)
|
||||
Button("*") {}
|
||||
.keyboardShortcut("*", app: app)
|
||||
.keyboardShortcut("asterisk", app: app)
|
||||
}
|
||||
.modifyContent(VStack.self) { $0.spacing(8) }
|
||||
.frame(maxWidth: .none)
|
||||
HStack {
|
||||
HStack(spacing: 8) {
|
||||
Button("4") {}
|
||||
.keyboardShortcut("4", app: app)
|
||||
Button("5") {}
|
||||
|
@ -44,11 +40,9 @@ struct AdwaitaTemplate: App {
|
|||
Button("6") {}
|
||||
.keyboardShortcut("6", app: app)
|
||||
Button("-") {}
|
||||
.keyboardShortcut("-", app: app)
|
||||
.keyboardShortcut("minus", app: app)
|
||||
}
|
||||
.modifyContent(VStack.self) { $0.spacing(8) }
|
||||
.frame(maxWidth: .none)
|
||||
HStack {
|
||||
HStack(spacing: 8) {
|
||||
Button("1") {}
|
||||
.keyboardShortcut("1", app: app)
|
||||
Button("2") {}
|
||||
|
@ -56,26 +50,20 @@ struct AdwaitaTemplate: App {
|
|||
Button("3") {}
|
||||
.keyboardShortcut("3", app: app)
|
||||
Button("+") {}
|
||||
.keyboardShortcut("+", app: app)
|
||||
.keyboardShortcut("plus", app: app)
|
||||
}
|
||||
.modifyContent(VStack.self) { $0.spacing(8) }
|
||||
.frame(maxWidth: .none)
|
||||
HStack {
|
||||
HStack(spacing: 8) {
|
||||
Button("0") {}
|
||||
.keyboardShortcut("0", app: app)
|
||||
Button("") {}
|
||||
Button(",") {}
|
||||
.keyboardShortcut(",", app: app)
|
||||
.keyboardShortcut("comma", app: app)
|
||||
Button("=") {}
|
||||
.keyboardShortcut("=", app: app)
|
||||
.keyboardShortcut("equal", app: app)
|
||||
}
|
||||
.modifyContent(VStack.self) { $0.spacing(8) }
|
||||
.frame(maxWidth: .none)
|
||||
}
|
||||
.spacing(8)
|
||||
.frame(maxHeight: .none)
|
||||
}
|
||||
.spacing(8)
|
||||
.padding()
|
||||
.topToolbar {
|
||||
ToolbarView(app: app, window: window)
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"app-id": "io.github.AparokshaUI.AdwaitaTemplate",
|
||||
"runtime": "org.gnome.Platform",
|
||||
"runtime-version": "47",
|
||||
"runtime-version": "48",
|
||||
"sdk": "org.gnome.Sdk",
|
||||
"sdk-extensions": [
|
||||
"org.freedesktop.Sdk.Extension.swift6"
|
||||
|
|
Loading…
Reference in New Issue