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

New UI #346

Merged
merged 35 commits into from
Sep 11, 2024
Merged
Changes from 1 commit
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
827bdfb
Begin implementing new UI
jordanbaird Sep 5, 2024
077bde7
Update IcePicker.swift
jordanbaird Sep 5, 2024
108ea36
Migrate General settings pane to new UI
jordanbaird Sep 6, 2024
a92b9c7
Remove old General settings pane
jordanbaird Sep 6, 2024
7117206
Fix custom image size in picker
jordanbaird Sep 6, 2024
08713e5
Implement IceMenu and fix menus in General settings pane
jordanbaird Sep 6, 2024
7857608
Merge branch '0.11.0' into ui-rewrite
jordanbaird Sep 6, 2024
a1efa32
Implement IceForm
jordanbaird Sep 7, 2024
4280744
Implement more of the UI
jordanbaird Sep 7, 2024
20909e0
More UI rewrites
jordanbaird Sep 7, 2024
91a7e68
Rename Annotation.swift to AnnotationView.swift
jordanbaird Sep 7, 2024
ae3be27
Merge branch '0.11.0' into ui-rewrite
jordanbaird Sep 9, 2024
f6d8229
Reworks
jordanbaird Sep 9, 2024
2cea930
Update IceMenu
jordanbaird Sep 10, 2024
ff712d0
Update IceMenu
jordanbaird Sep 10, 2024
aea4d0e
Tweaks
jordanbaird Sep 10, 2024
2016d93
Remove rectangle mask
jordanbaird Sep 10, 2024
9b1061b
More IceMenu tweaks
jordanbaird Sep 10, 2024
c4e00c0
More IceMenu tweaks
jordanbaird Sep 10, 2024
200eac8
Update GeneralSettingsPane.swift
jordanbaird Sep 10, 2024
89804d8
Rework IceSlider
jordanbaird Sep 10, 2024
abb7fa2
Update .swiftlint.yml
jordanbaird Sep 10, 2024
ec576ea
Update IceSection.swift
jordanbaird Sep 10, 2024
a2af34c
Tweaks
jordanbaird Sep 10, 2024
7980ecc
Misc changes
jordanbaird Sep 10, 2024
9700bd4
Rework SettingsView sidebar
jordanbaird Sep 10, 2024
d65eee1
Fix key repeat in SectionedList
jordanbaird Sep 10, 2024
e17d211
Fix content margins in SectionedList
jordanbaird Sep 10, 2024
56b70ac
Update SettingsView.swift
jordanbaird Sep 10, 2024
9bc449a
Fix launch behavior on macOS 15
jordanbaird Sep 11, 2024
54e5c46
Update SettingsWindow.swift
jordanbaird Sep 11, 2024
8e469ad
More macOS 15 tweaks
jordanbaird Sep 11, 2024
f080326
Misc tweaks
jordanbaird Sep 11, 2024
425d9b4
Fix launch behavior on macOS 14
jordanbaird Sep 11, 2024
62e0a07
Use IceSection in PermissionsView
jordanbaird Sep 11, 2024
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update SettingsWindow.swift
  • Loading branch information
jordanbaird committed Sep 11, 2024
commit 54e5c46f77001d8f87d755e9dfa4dc352937372a
4 changes: 2 additions & 2 deletions Ice/Settings/SettingsWindow.swift
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ struct SettingsWindow: Scene {
}

@available(macOS 14.0, *)
struct SettingsWindowMacOS14: Scene {
private struct SettingsWindowMacOS14: Scene {
let onAppear: () -> Void

var body: some Scene {
Expand All @@ -41,7 +41,7 @@ struct SettingsWindowMacOS14: Scene {
}

@available(macOS 15.0, *)
struct SettingsWindowMacOS15: Scene {
private struct SettingsWindowMacOS15: Scene {
@Environment(\.dismissWindow) private var dismissWindow
@State private var launchBehavior: SceneLaunchBehavior = .presented

Expand Down