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

feat: refactor the appearance preferences for simplification. #3468

Closed
wants to merge 377 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
377 commits
Select commit Hold shift + click to select a range
7034e13
feat: update new style
Allsochen Aug 9, 2024
b9401ec
feat: use new style in policies tab
Allsochen Aug 10, 2024
b4e872a
feat: add spacer between title table group view
Allsochen Aug 10, 2024
601b563
feat: split shortcuts button and advanced button
Allsochen Aug 10, 2024
0055eb5
feat: support only show applications
Allsochen Aug 10, 2024
5ac71d7
feat: fix controls tab shortcuts failure
Allsochen Aug 10, 2024
8ef58d6
feat: fix shortcuts button and advanced button layout on one row
Allsochen Aug 10, 2024
d7d386d
feat: unify the width of preference windows
Allsochen Aug 10, 2024
c683734
feat: add light or dark appearance theme
Allsochen Aug 11, 2024
284af5f
feat: add light or dark appearance theme
Allsochen Aug 11, 2024
f350d31
feat: add segmented control button
Allsochen Aug 11, 2024
5fcf800
feat: fix selected segment bug
Allsochen Aug 11, 2024
4c7aa54
feat: clean unused code
Allsochen Aug 11, 2024
a072bf9
feat: refactor code
Allsochen Aug 11, 2024
76de60f
feat: refactor code
Allsochen Aug 11, 2024
4d00551
feat: add label in app icons model
Allsochen Aug 11, 2024
84e4616
feat: adjust the parameter of appearance theme
Allsochen Aug 11, 2024
bdaa68f
feat: make the width of appearance size and theme are equals
Allsochen Aug 11, 2024
4c41e5d
feat: fix dock icon color incorrect
Allsochen Aug 11, 2024
8861d00
feat: fix UI detail
Allsochen Aug 12, 2024
aa4058c
feat: fix UI detail
Allsochen Aug 12, 2024
a3a2cf1
feat: fix UI detail
Allsochen Aug 12, 2024
9c4e303
feat: fix UI detail
Allsochen Aug 12, 2024
4d5ed70
feat: fix UI detail
Allsochen Aug 12, 2024
b927856
feat: fix UI detail
Allsochen Aug 12, 2024
1cdd622
feat: fix controls tab UI
Allsochen Aug 13, 2024
a3f02e4
feat: add esc key to close sheet window
Allsochen Aug 13, 2024
c9d8ca3
feat: add esc/enter key to close sheet window
Allsochen Aug 13, 2024
71eb7a6
fix: imitate system-settings dropdown more
lwouis Aug 14, 2024
62f5e5d
fix: sheets improved
lwouis Aug 14, 2024
4d4f6dd
fix: show dropdown all the time, until we find a better way
lwouis Aug 14, 2024
2576c23
fix: imitate system-settings dropdown more
lwouis Aug 14, 2024
874919b
fix: sheets improved
lwouis Aug 14, 2024
2a8d671
fix: show dropdown all the time, until we find a better way
lwouis Aug 14, 2024
23d4d82
Merge remote-tracking branch 'upstream/pull-3468' into pull-3468
Allsochen Aug 15, 2024
697af41
fix: sheets improved
Allsochen Aug 15, 2024
72439d5
feat: make preferences window look more like safari
lwouis Aug 15, 2024
47a5601
feat: switch from 'automatic' to 'system' for theme
lwouis Aug 15, 2024
852311d
feat: remove cursor-follows-focus preference
lwouis Aug 15, 2024
b7c6423
fix: dont apply preference if value has not changed
lwouis Aug 15, 2024
fd9c7d6
feat: add icons to theme segmented controls
lwouis Aug 15, 2024
8800b98
feat: align tabs design, improve wording, separate code
lwouis Aug 15, 2024
9d160b4
fix: #available should be macos now apparently
lwouis Aug 15, 2024
7ad39f0
feat: improve wording and layout of the tabs
lwouis Aug 15, 2024
9274b69
chore: remove vertical-alignment preference code
lwouis Aug 16, 2024
e8bcdef
feat: modify the scale of apparition appearance
Allsochen Aug 16, 2024
9deb248
feat: try focused border
Allsochen Aug 16, 2024
e305959
chore: truncation moved from dropdown to radio buttons
lwouis Aug 16, 2024
12ccc60
chore: clarify wording, externally and internally
lwouis Aug 16, 2024
724bf90
fix: sheets need to be loaded at launch for shortcuts to work
lwouis Aug 16, 2024
51ad212
feat: modify radio buttons
Allsochen Aug 16, 2024
b9d07f2
chore: fix folder names
lwouis Aug 16, 2024
2a8fec1
fix: customize sheet needs to be refreshed after style change
lwouis Aug 16, 2024
1675ab1
chore: rename model to style
lwouis Aug 16, 2024
236ceb3
feat: add showAppNamesWindowTitles to thumbnails view
lwouis Aug 16, 2024
267aafe
chore: update name of 2 preferences
lwouis Aug 16, 2024
80065ce
fix: clarify wording for windows-or-applications
lwouis Aug 16, 2024
b536314
feat: add thumbnails titles
Allsochen Aug 16, 2024
1cb04b8
fix: add migration to fix indexes order for all preferences
lwouis Aug 16, 2024
1751670
feat: switch policies to dropdowns instead of radio buttons
lwouis Aug 16, 2024
06615d3
Merge remote-tracking branch 'origin/refactor-appearance-settings' in…
Allsochen Aug 16, 2024
9053510
feat: add high visibility
Allsochen Aug 16, 2024
b4d6de3
feat: add custom switch button
Allsochen Aug 17, 2024
f1b3dae
feat: add high visibility
Allsochen Aug 17, 2024
19f10a4
fix: fix lost NSButton control value
Allsochen Aug 17, 2024
13d2367
feat: add high visibility
Allsochen Aug 17, 2024
85f52f9
fix: align buttons to sentence-case
lwouis Aug 17, 2024
5f71ff9
Merge remote-tracking branch 'origin/refactor-appearance-settings' in…
Allsochen Aug 17, 2024
bd971f3
feat: add checkbox interface
Allsochen Aug 17, 2024
7bde628
fix: align buttons to sentence-case
lwouis Aug 17, 2024
0579185
Merge remote-tracking branch 'origin/refactor-appearance-settings' in…
Allsochen Aug 17, 2024
98f9cb1
fix: make high visibility mode more clear
Allsochen Aug 18, 2024
4592f5d
fix: modify showing windows from to 3 rows
Allsochen Aug 18, 2024
cdba5a8
feat: change showing in switcher introduction to info button
Allsochen Aug 18, 2024
9e6bc15
fix: fix the background color of table group view
Allsochen Aug 18, 2024
9da4c48
fix: fix the detail of switch button
Allsochen Aug 18, 2024
263c06a
fix: fix the color of table group view
Allsochen Aug 18, 2024
763ac21
fix: fix description string in one line
Allsochen Aug 18, 2024
f05d826
feat: use switch instead of checkbox
Allsochen Aug 18, 2024
8eb6bef
fix: typo
lwouis Aug 18, 2024
302cbf1
fix: fix apparition delay layout incorrect
Allsochen Aug 18, 2024
8b1dc7e
fix: badge was clipping in small size + tweak font sizes
lwouis Aug 18, 2024
6e69344
refactor: rename height
Allsochen Aug 18, 2024
653b74e
fix: badge was clipped on small size appearance
lwouis Aug 18, 2024
02afce3
fix: fix label truncation incorrect
Allsochen Aug 19, 2024
f129559
Merge remote-tracking branch 'origin/refactor-appearance-settings' in…
Allsochen Aug 19, 2024
0ec4b01
chore: cleaned up the appearance file
lwouis Aug 19, 2024
18abc18
fix: better fallback when app-name or window-title is nil
lwouis Aug 19, 2024
76fb1cc
chore: remove unnecessary cleanup calls
lwouis Aug 19, 2024
3db22bb
chore: remove unused resources from the build
lwouis Aug 19, 2024
903f0f0
feat: add edge insets size
Allsochen Aug 20, 2024
5baa073
fix: fix thumbnail inter width incorrect
Allsochen Aug 20, 2024
4289af6
fix: fix thumbnail inter width incorrect
Allsochen Aug 20, 2024
f63a596
chore: remove unused variable
lwouis Aug 20, 2024
c64a5fd
fix: fix title empty when open AltTab first time
Allsochen Aug 20, 2024
2ecc56f
Merge remote-tracking branch 'origin/refactor-appearance-settings' in…
Allsochen Aug 20, 2024
0239fe5
fix: fix title empty when open AltTab first time
Allsochen Aug 20, 2024
87f671b
fix: modify min width in title style
Allsochen Aug 20, 2024
3ac6e48
fix: fix illustrations flicker on mouse hover
Allsochen Aug 20, 2024
1e2e17b
fix: add edgeInsetsSize on thumbnail style
Allsochen Aug 20, 2024
a38fba6
feat: make bold text in image text button
Allsochen Aug 20, 2024
b381fe9
feat: make bold text in image text button
Allsochen Aug 21, 2024
d8ff01c
feat: make bold text in image text button
Allsochen Aug 21, 2024
d5bdaa9
fix: fix appearance style button border incorrect
Allsochen Aug 21, 2024
91f4e48
feat: add image radio buttons without label
Allsochen Aug 21, 2024
2e5d9df
feat: set windowDisplayDelay default time
Allsochen Aug 21, 2024
e016b3e
fix: keep window padding as same on AppIcons style
Allsochen Aug 21, 2024
926d4dc
fix: keep window padding as same on AppIcons style
Allsochen Aug 21, 2024
97c571e
fix: fix appearance style detail
Allsochen Aug 23, 2024
01991b6
fix: fix appearance style detail
Allsochen Aug 23, 2024
ca7c566
fix: fix title incorrect on mouse hover
Allsochen Aug 23, 2024
54b3ae8
feat: move icons to illustrations directory
Allsochen Aug 23, 2024
187d168
fix: fix high visibility appearance style detail
Allsochen Aug 23, 2024
cf8538d
feat: add i18n
Allsochen Aug 23, 2024
b2bb15d
feat: compress illustrations
Allsochen Aug 23, 2024
f715790
feat: change showing windows from to dropdown
Allsochen Aug 23, 2024
ae162c4
fix: revert mouseHoverEnabled
Allsochen Aug 23, 2024
ff0710b
chore: space should be capitalized (macos concept)
lwouis Aug 23, 2024
6e46fbc
fix: adapter checkbox and switch
Allsochen Aug 24, 2024
a432db7
fix: disabled some show hide item in Apps mode
Allsochen Aug 24, 2024
995b5b0
Merge remote-tracking branch 'origin/refactor-appearance-settings' in…
Allsochen Aug 24, 2024
46f6d3c
fix: disabled some show hide item in Apps mode
Allsochen Aug 24, 2024
e38bdd5
fix: fix the state of showing title
Allsochen Aug 24, 2024
321b64c
fix: fix the state of switch
Allsochen Aug 24, 2024
3ce0067
fix: fix separator showing full width on mouse hover
Allsochen Aug 25, 2024
4a59530
fix: fix separator showing full width on mouse hover
Allsochen Aug 25, 2024
dbb09a9
fix: fix separator showing full width on mouse hover
Allsochen Aug 25, 2024
12b5357
fix: fix the thumbnail width and height when open stage manager
Allsochen Aug 25, 2024
5f4e893
fix: disable the screenshot in stage manager
Allsochen Aug 25, 2024
a4191c8
fix: fix the thumbnail width and height when open stage manager
Allsochen Aug 26, 2024
dec165b
fix: fix high visibility shadow detail
Allsochen Aug 26, 2024
f4e67c7
fix: fix high visibility shadow detail
Allsochen Aug 26, 2024
917c350
fix: fix switch sometimes do not apply
Allsochen Aug 26, 2024
1590e15
fix: fix switch sometimes do not apply
Allsochen Aug 27, 2024
d7abb4c
fix: adjust the icon size on AppIcons style
Allsochen Aug 27, 2024
746a7c6
fix: i8n
Allsochen Aug 28, 2024
b8d8c9f
fix: i8n
Allsochen Aug 28, 2024
d215c96
fix: i8n
Allsochen Aug 28, 2024
949d809
fix: adjust the icon size on AppIcons style
Allsochen Aug 28, 2024
cf98ac9
fix: i8n
Allsochen Aug 28, 2024
c49bd6c
fix: code warning
Allsochen Aug 28, 2024
e766005
feat: reworded tooltip for clarity and concision
lwouis Aug 28, 2024
1d2b3a9
feat: reworded tooltip for clarity and concision 2
lwouis Aug 28, 2024
f7a2166
fix: force use of onlyShowApplications throughout to avoid bugs
lwouis Aug 28, 2024
f88cc5f
fix: reuse app focus code for onlyShowApplications case
lwouis Aug 28, 2024
8d9c619
fix: fix crash in title style with windowless
Allsochen Aug 28, 2024
6b8cd41
fix: fix preview selected windows on Apps model
Allsochen Aug 29, 2024
3a68644
fix: fix separator incorrent when changing system appearance
Allsochen Aug 29, 2024
729a5cd
fix: revert to previous version avoid opening other AltTab
Allsochen Aug 29, 2024
69327ad
fix: improve app focus
lwouis Aug 30, 2024
173afaa
fix: fix medium size as same as built-in switch
Allsochen Aug 30, 2024
c976f35
fix: fix medium size as same as built-in switch
Allsochen Aug 30, 2024
5617dfd
fix: make thumbnail style more visible
Allsochen Aug 30, 2024
885d78a
fix: make appearance more visible
Allsochen Aug 31, 2024
82de59b
fix: make appearance more visible
Allsochen Aug 31, 2024
e76949c
fix: make appearance more visible
Allsochen Aug 31, 2024
4cb5ba4
fix: make appearance more visible
Allsochen Sep 1, 2024
1187885
fix: make appearance more visible
Allsochen Sep 1, 2024
c58b48d
feat: add SwiftFormat
Allsochen Sep 1, 2024
1796882
feat: add SwiftFormat
Allsochen Sep 1, 2024
35787b1
feat: test swift format
Allsochen Sep 1, 2024
eedc096
fix: make appearance more visible
Allsochen Sep 1, 2024
d1b64e9
chore: update SwiftFormat referenced source
Allsochen Sep 1, 2024
077b27f
chore: add ignore files for SwiftFormat
Allsochen Sep 1, 2024
43dc9a3
chore: add ignore files for SwiftFormat
Allsochen Sep 1, 2024
e981c84
chore: add ignore files for SwiftFormat
Allsochen Sep 1, 2024
c784002
fix: fix the badge position incorrect when opening for first time
Allsochen Sep 1, 2024
10158c0
fix: fix preference can use with keyboard
Allsochen Sep 1, 2024
3eb6a16
chore: add ignore files for SwiftFormat
Allsochen Sep 1, 2024
a87ddd5
fix: revert general preference tab
Allsochen Sep 3, 2024
20c4854
fix: fix Swift acceptsFirstResponder
Allsochen Sep 3, 2024
e446f0b
fix: fix ImageTextButtonView acceptsFirstResponder
Allsochen Sep 4, 2024
0a9cffa
fix: fix focused ring when switching tab
Allsochen Sep 5, 2024
372846f
fix: update illustrations
Allsochen Sep 5, 2024
9911e8d
fix: add NSVisualEffectView highlight view
Allsochen Sep 6, 2024
a42dd9c
fix: add NSVisualEffectView highlight view
Allsochen Sep 7, 2024
1d1febf
fix: update high visibility
Allsochen Sep 7, 2024
f2cb7bc
fix: set the border width as same as system setting
Allsochen Sep 7, 2024
eb2dd3d
feat: merge to one visibility option
Allsochen Sep 8, 2024
794890d
fix: fix table corners
Allsochen Sep 8, 2024
9dc9e54
fix: expand horizontally beyond their tile
Allsochen Sep 8, 2024
ecfdd51
fix: expand horizontally beyond their tile
Allsochen Sep 8, 2024
e63bd29
feat: remove icon toolTip
Allsochen Sep 9, 2024
030c44a
fix: modify the icon of visibility
Allsochen Sep 9, 2024
66c8c39
fix: modify the icon of visibility
Allsochen Sep 9, 2024
5cc7f37
fix: expand horizontally beyond their tile
Allsochen Sep 9, 2024
2ced838
fix: expand horizontally beyond their tile
Allsochen Sep 9, 2024
7c4e794
fix: expand horizontally beyond their tile
Allsochen Sep 9, 2024
b8e65e3
fix: expand horizontally beyond their tile
Allsochen Sep 9, 2024
5b72505
fix: expand horizontally beyond their tile
Allsochen Sep 9, 2024
a077a26
fix: expand horizontally beyond their tile
Allsochen Sep 9, 2024
d78081a
fix: i8n
Allsochen Sep 9, 2024
e8005c1
fix: i8n
Allsochen Sep 9, 2024
c37aa28
fix: fix edge insets size
Allsochen Sep 9, 2024
9ba1a30
fix: expand horizontally beyond their tile
Allsochen Sep 10, 2024
c2df883
fix: fix icon align to top under app icons style
Allsochen Sep 10, 2024
fbee238
feat: import SwiftyBeaver logger
Allsochen Sep 10, 2024
1db004d
feat: replace debugPrint to logger
Allsochen Sep 10, 2024
1763d84
feat: replace debugPrint to logger
Allsochen Sep 10, 2024
ebb509f
docs: add swiftybeaver to acknowledgments.md
lwouis Sep 10, 2024
5ad663e
chore: make logmanager static and dont start unneeded timer
lwouis Sep 10, 2024
d518422
refactor: refactor appearance
Allsochen Sep 11, 2024
efc7ad6
fix: remove highlight view using NSVisualEffectView
Allsochen Sep 11, 2024
cc5b587
refactor: move more code to appearance file
lwouis Sep 11, 2024
e98eba6
fix: fix sometimes thumbnail view flicker when hovering
Allsochen Sep 14, 2024
dd595e4
fix: fix switching title between focus and hover
Allsochen Sep 14, 2024
6b43928
fix: fix sometimes thumbnail view flicker when hovering
Allsochen Sep 14, 2024
1a70568
fix: fix icon align to top under app icons style
Allsochen Sep 14, 2024
516bedf
refactor: refactor row info in thumbnail view
Allsochen Sep 14, 2024
5cbbde9
fix: fix icon align to top under app icons style
Allsochen Sep 14, 2024
5d8091a
fix: fix icon align to top under app icons style
Allsochen Sep 14, 2024
7ab20e4
fix: remove root cause and workaround for flickering
lwouis Sep 14, 2024
8bf1168
fix: fix showing focused title when exiting hover under app icons style
Allsochen Sep 16, 2024
26fe3dc
fix: fix showing focused title when exiting hover under app icons style
Allsochen Sep 18, 2024
e516dec
fix: fix icon align to top under app icons style
Allsochen Sep 18, 2024
fe66887
fix: fix icon align to top under app icons style
Allsochen Sep 18, 2024
8df3484
fix: fix icon align to top under app icons style
Allsochen Sep 18, 2024
1d8e48e
fix: fix icon align to top under app icons style
Allsochen Sep 18, 2024
858eaa6
fix: fix icon align to top under app icons style
Allsochen Sep 19, 2024
e41d6a8
fix: add logger enabled condition
Allsochen Sep 19, 2024
26f0d33
fix: rename check inter padding function
Allsochen Sep 20, 2024
18f4109
Merge branch 'dev' into refactor-appearance-settings
lwouis Sep 20, 2024
1037e63
feat: add a circle to indicate the state of no open window
Allsochen Sep 20, 2024
82030d6
feat: add a circle to indicate the state of no open window
Allsochen Sep 20, 2024
c7d46ac
fix: try fixing the screenshot in stage manager mode
Allsochen Sep 21, 2024
c58c5fb
fix: try fixing the screenshot in stage manager mode
Allsochen Sep 21, 2024
b87d2a0
fix: try fixing the screenshot in stage manager mode
Allsochen Sep 22, 2024
6a6f8dc
fix: try fixing the screenshot in stage manager mode
Allsochen Sep 23, 2024
d9056b2
fix: renamed indicator and reduced its opacity to match os
lwouis Sep 23, 2024
284af79
fix: try fixing the screenshot in stage manager mode
Allsochen Sep 23, 2024
8c727d6
fix: try fixing the screenshot in stage manager mode
Allsochen Sep 23, 2024
a69ccee
fix: add try catch while processing fail
Allsochen Sep 24, 2024
f2ae0d8
fix: try fixing the screenshot in stage manager mode
Allsochen Sep 24, 2024
3610441
fix: try fixing the screenshot in stage manager mode
Allsochen Sep 24, 2024
4c2f021
fix: try fixing the screenshot in stage manager mode
Allsochen Sep 24, 2024
98b2b2e
fix: try fixing the screenshot in stage manager mode
Allsochen Sep 25, 2024
6efc722
refactor: refactor windowControlIcons
Allsochen Sep 25, 2024
636b302
fix: fix windowless indicator
Allsochen Sep 26, 2024
fe25955
fix: fix windowless indicator
Allsochen Sep 26, 2024
bf359fe
fix: run extract_l10n_strings.sh
lwouis Sep 30, 2024
62358c7
fix: run translate_i18n_tools.py
lwouis Sep 30, 2024
8f4523e
chore: streamline python scripts usage
lwouis Sep 30, 2024
f2a9ec7
chore: fix build warning on higher swift versions
decodism Jul 11, 2024
a31fa0b
refactor: add periphery to remove dead code on the project
lwouis Oct 3, 2024
19e52ab
fix: disable StageManager
Allsochen Oct 8, 2024
3465973
chore: remove stagemanager changes (to revert later)
lwouis Oct 8, 2024
0f00912
fix: dragging files onto windowless apps was inconsistent
lwouis Oct 8, 2024
c323b56
fix: fix windowless indicator under right-to-left language
Allsochen Oct 9, 2024
5feada3
fix: fix retry time for translate
Allsochen Oct 9, 2024
22a8883
fix: try translating to target language using Google translator
Allsochen Oct 9, 2024
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
Prev Previous commit
Next Next commit
chore: fix build warning on higher swift versions
  • Loading branch information
decodism authored and lwouis committed Oct 3, 2024
commit f2a9ec73e5a10fa5bab2328906cceea8044de2e1
4 changes: 2 additions & 2 deletions src/logic/Window.swift
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ class Window: CustomStringConvertible {
func isEqualRobust(_ otherWindowAxUiElement: AXUIElement, _ otherWindowWid: CGWindowID?) -> Bool {
// the window can be deallocated by the OS, in which case its `CGWindowID` will be `-1`
// we check for equality both on the AXUIElement, and the CGWindowID, in order to catch all scenarios
return otherWindowAxUiElement == axUiElement || (cgWindowId != nil && Int(cgWindowId!) != -1 && otherWindowWid == cgWindowId)
return otherWindowAxUiElement == axUiElement || (cgWindowId != nil && cgWindowId != CGWindowID(bitPattern: -1) && otherWindowWid == cgWindowId)
}

private func observeEvents() {
Expand All @@ -126,7 +126,7 @@ class Window: CustomStringConvertible {
}

private func screenshot(_ bestResolution: Bool = false) -> NSImage? {
guard !isWindowlessApp, let cgWindowId = cgWindowId, cgWindowId != -1, let cgImage = cgWindowId.screenshot(bestResolution) else {
guard !isWindowlessApp, let cgWindowId = cgWindowId, cgWindowId != CGWindowID(bitPattern: -1), let cgImage = cgWindowId.screenshot(bestResolution) else {
return nil
}
return NSImage(cgImage: cgImage, size: NSSize(width: cgImage.width, height: cgImage.height))
Expand Down