From f97e9f93334a24695b96f7d8bef3e27c3e544ebf Mon Sep 17 00:00:00 2001 From: lwouis Date: Tue, 3 Dec 2024 21:46:26 +0100 Subject: [PATCH] feat: improve tooltips in preferences --- alt-tab-macos.xcodeproj/project.pbxproj | 12 ----- resources/SF-Pro-Text-Regular.otf | Bin 13864 -> 13644 bytes .../icons/preferences/info_button@2x.png | Bin 20099 -> 0 bytes scripts/subset_font.sh | 2 +- .../main-window/ThumbnailFontIconView.swift | 1 + .../preferences-window/LabelAndControl.swift | 43 ++++++------------ .../tabs/appearance/AppearanceTab.swift | 36 +++++++++------ 7 files changed, 37 insertions(+), 57 deletions(-) delete mode 100644 resources/icons/preferences/info_button@2x.png diff --git a/alt-tab-macos.xcodeproj/project.pbxproj b/alt-tab-macos.xcodeproj/project.pbxproj index 8f141b72..38618bac 100644 --- a/alt-tab-macos.xcodeproj/project.pbxproj +++ b/alt-tab-macos.xcodeproj/project.pbxproj @@ -53,7 +53,6 @@ 1C961BD37A4652E7A692ED8A /* thumbnails_show_running_applications_light@2x.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 1C961484E5164C1BFF3B78FF /* thumbnails_show_running_applications_light@2x.jpg */; }; 1C961C3245C17EC408B798DE /* app_icons_hide_preview_focused_window_light@2x.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 1C961A9B3F8ABA1ECFDF7C9F /* app_icons_hide_preview_focused_window_light@2x.jpg */; }; 1C961C7FC66CEEE4223C57A2 /* thumbnails_hide_space_number_labels_light@2x.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 1C9611334B667767A4514B57 /* thumbnails_hide_space_number_labels_light@2x.jpg */; }; - 1C961CB7E9B170E1CD99881F /* info_button@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1C9616ABADF052D54E9375C2 /* info_button@2x.png */; }; 1C961D268F3911907129C96A /* titles_show_windowless_apps_light@2x.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 1C9618877FB96FD51E89A597 /* titles_show_windowless_apps_light@2x.jpg */; }; 1C961DD2AB893820F334BBA4 /* thumbnails_hide_preview_focused_window_light@2x.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 1C961802AB937EC23AADBBFA /* thumbnails_hide_preview_focused_window_light@2x.jpg */; }; 1C961DE40FF784E02A044D35 /* thumbnails_hide_status_icons_light@2x.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 1C9616C88A2EED5DFF4E83D8 /* thumbnails_hide_status_icons_light@2x.jpg */; }; @@ -291,7 +290,6 @@ 1C9616522F4E58860385E090 /* .swiftformat */ = {isa = PBXFileReference; lastKnownFileType = file.swiftformat; path = .swiftformat; sourceTree = ""; }; 1C9616610337AE2361694C63 /* titles_hide_preview_focused_window_light@2x.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = "titles_hide_preview_focused_window_light@2x.jpg"; sourceTree = ""; }; 1C96168DC0D8707F8EC6B442 /* titles_show_running_applications_windows_light@2x.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = "titles_show_running_applications_windows_light@2x.jpg"; sourceTree = ""; }; - 1C9616ABADF052D54E9375C2 /* info_button@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "info_button@2x.png"; sourceTree = ""; }; 1C9616C88A2EED5DFF4E83D8 /* thumbnails_hide_status_icons_light@2x.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = "thumbnails_hide_status_icons_light@2x.jpg"; sourceTree = ""; }; 1C9617A90991E963760F7475 /* thumbnails_show_app_badges_light@2x.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = "thumbnails_show_app_badges_light@2x.jpg"; sourceTree = ""; }; 1C9617C5839903D752070CF2 /* ImageTextButtonView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImageTextButtonView.swift; sourceTree = ""; }; @@ -716,14 +714,6 @@ path = illustrations; sourceTree = ""; }; - 1C961A5CDC3134CCB0811D78 /* preferences */ = { - isa = PBXGroup; - children = ( - 1C9616ABADF052D54E9375C2 /* info_button@2x.png */, - ); - path = preferences; - sourceTree = ""; - }; 1C961B4542D84D5B6E937B15 /* workflows */ = { isa = PBXGroup; children = ( @@ -1484,7 +1474,6 @@ BF0C86C288D4FD8F92D3C7DB /* app */, BF0C80536B40523C5DB23BE2 /* menubar */, BF0C8060939B50725E1C3392 /* permission-window */, - 1C961A5CDC3134CCB0811D78 /* preferences */, ); path = icons; sourceTree = ""; @@ -2004,7 +1993,6 @@ BF0C816911CAD3F1B5865BFA /* Localizable.strings in Resources */, BF0C863526C260F4155F9D2C /* Localizable.strings in Resources */, BF0C8C0EDECEA32BBCE5B27D /* Localizable.strings in Resources */, - 1C961CB7E9B170E1CD99881F /* info_button@2x.png in Resources */, 1C96150A9E75C3D69638C481 /* app_icons_light@2x.jpg in Resources */, 1C9617DCCF162B8F8CBF2C1D /* app_icons_align_thumbnails_center_light@2x.jpg in Resources */, 1C961F211FCEFE8A725563DD /* app_icons_align_thumbnails_leading_light@2x.jpg in Resources */, diff --git a/resources/SF-Pro-Text-Regular.otf b/resources/SF-Pro-Text-Regular.otf index c7049419f7b9dae10defc08fe006ccdf8e7e7c78..13608599f834d7f805daf248742386ef9a686614 100644 GIT binary patch delta 4735 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 W06LqpA}{hUP`Bq;9|mRkocS*!Cti5~ delta 4963 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�MezkVPss( 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 iVMv%#V1s}k1pYrL6E3=iwxSRK0000 ClickHoverImageView { - let imageView = NSImageView(image: NSImage(named: "info_button")!) - imageView.translatesAutoresizingMaskIntoConstraints = false - imageView.imageScaling = .scaleProportionallyUpOrDown - - // Enable layer-backed view to improve rendering quality - imageView.wantsLayer = true - imageView.layer?.contentsGravity = .resizeAspect - imageView.layer?.shouldRasterize = true - imageView.layer?.rasterizationScale = NSScreen.main?.backingScaleFactor ?? 1.0 - - let view = ClickHoverImageView(imageView: imageView) + let imageView = ThumbnailFontIconView(symbol: .circledInfo, size: size, color: .labelColor, shadow: nil) + let view = ClickHoverImageView(infoCircle: imageView) view.onClick = onClick view.onMouseEntered = onMouseEntered view.onMouseExited = onMouseExited - - // Set constraints to add equal padding around the image NSLayoutConstraint.activate([ - imageView.widthAnchor.constraint(equalToConstant: width), - imageView.heightAnchor.constraint(equalToConstant: height), - imageView.topAnchor.constraint(equalTo: view.topAnchor, constant: padding), - imageView.bottomAnchor.constraint(equalTo: view.bottomAnchor, constant: -padding), - imageView.leadingAnchor.constraint(equalTo: view.leadingAnchor, constant: padding), - imageView.trailingAnchor.constraint(equalTo: view.trailingAnchor, constant: -padding), + imageView.topAnchor.constraint(equalTo: view.topAnchor), + imageView.bottomAnchor.constraint(equalTo: view.bottomAnchor), + imageView.leadingAnchor.constraint(equalTo: view.leadingAnchor), + imageView.trailingAnchor.constraint(equalTo: view.trailingAnchor), ]) - return view } @@ -172,10 +156,9 @@ class LabelAndControl: NSObject { onClick: EventClosure? = nil, onMouseEntered: EventClosure? = nil, onMouseExited: EventClosure? = nil, - width: CGFloat = 15, - height: CGFloat = 15) -> [NSView] { + size: CGFloat = 15) -> [NSView] { let labelCheckboxViews = makeLabelWithCheckbox(labelText, rawName, extraAction: extraAction, labelPosition: labelPosition) - let infoButtonView = makeInfoButton(width: width, height: height, onClick: onClick, onMouseEntered: onMouseEntered, onMouseExited: onMouseExited) + let infoButtonView = makeInfoButton(size: size, onClick: onClick, onMouseEntered: onMouseEntered, onMouseExited: onMouseExited) var views: [NSView] = [] labelCheckboxViews.forEach { view in diff --git a/src/ui/preferences-window/tabs/appearance/AppearanceTab.swift b/src/ui/preferences-window/tabs/appearance/AppearanceTab.swift index 1178e3a5..15664c9b 100644 --- a/src/ui/preferences-window/tabs/appearance/AppearanceTab.swift +++ b/src/ui/preferences-window/tabs/appearance/AppearanceTab.swift @@ -30,7 +30,7 @@ class IllustratedImageThemeView: ClickHoverImageView { imageView.layer?.masksToBounds = true imageView.layer?.cornerRadius = TableGroupView.cornerRadius - super.init(imageView: imageView) + super.init(infoCircle: imageView) self.style = style self.theme = theme self.imageName = imageName @@ -77,12 +77,12 @@ class IllustratedImageThemeView: ClickHoverImageView { if highlighted { updateImage(imageName) } else { - self.imageView.image = NSImage(named: self.imageName) + (infoCircle as! NSImageView).image = NSImage(named: self.imageName) } } private func updateImage(_ imageName: String) { - imageView.image = NSImage(named: self.getStyleThemeImageName(imageName)) + (infoCircle as! NSImageView).image = NSImage(named: getStyleThemeImageName(imageName)) } static func getConcatenatedImageName(_ style: AppearanceStylePreference, @@ -214,7 +214,7 @@ class ShowHideIllustratedView { showTabsAsWindows.supportedStyles = [.thumbnails, .appIcons, .titles] showTabsAsWindows.leftViews = [TableGroupView.makeText(NSLocalizedString("Show standard tabs as windows", comment: ""))] showTabsAsWindows.subTitle = NSLocalizedString("Some apps like Finder or Preview use standard tabs which act like independent windows. Some other apps like web browsers use custom tabs which act in unique ways and are not actual windows. AltTab can't list those separately.", comment: "") - showTabsAsWindows.rightViews.append(LabelAndControl.makeInfoButton(width: 15, height: 15, onMouseEntered: { event, view in + showTabsAsWindows.rightViews.append(LabelAndControl.makeInfoButton(onMouseEntered: { event, view in if ShowHideIllustratedView.isDisabledOnApplications(showTabsAsWindows) { Popover.shared.show(event: event, positioningView: view, message: featureUnavailable) } else { @@ -237,7 +237,7 @@ class ShowHideIllustratedView { previewFocusedWindow.supportedStyles = [.thumbnails, .appIcons, .titles] previewFocusedWindow.leftViews = [TableGroupView.makeText(NSLocalizedString("Preview selected window", comment: ""))] previewFocusedWindow.subTitle = NSLocalizedString("Preview the selected window.", comment: "") - previewFocusedWindow.rightViews.append(LabelAndControl.makeInfoButton(width: 15, height: 15, onMouseEntered: { event, view in + previewFocusedWindow.rightViews.append(LabelAndControl.makeInfoButton(onMouseEntered: { event, view in if ShowHideIllustratedView.isDisabledOnApplications(previewFocusedWindow) { Popover.shared.show(event: event, positioningView: view, message: featureUnavailable) } else { @@ -329,11 +329,13 @@ class ShowHideIllustratedView { } } -class Popover: NSPopover { +class Popover: NSPopover, NSPopoverDelegate { static let shared = Popover() + private var hidingInitiated = true override init() { super.init() + delegate = self contentViewController = NSViewController() behavior = .semitransient } @@ -342,12 +344,18 @@ class Popover: NSPopover { fatalError("init(coder:) has not been implemented") } + func popoverWillClose(_ notification: Notification) { + hidingInitiated = true + } + func hide() { performClose(nil) } - func show(event: NSEvent, positioningView: NSView, message: String) { - hide() + func show(event: NSEvent, positioningView: NSView, message: String, extraView: NSView? = nil) { + if !hidingInitiated { return } + hidingInitiated = false + let view = NSView() let label = NSTextField(labelWithString: message) @@ -356,16 +364,16 @@ class Popover: NSPopover { label.maximumNumberOfLines = 0 label.isEditable = false label.isSelectable = true - label.textColor = NSColor.gray label.font = NSFont.systemFont(ofSize: 12) - view.addSubview(label) + var actualView: NSView = extraView == nil ? label : StackView([label, extraView!], .vertical) + view.addSubview(actualView) NSLayoutConstraint.activate([ view.widthAnchor.constraint(lessThanOrEqualToConstant: 400), - label.topAnchor.constraint(equalTo: view.topAnchor, constant: 10), - label.bottomAnchor.constraint(equalTo: view.bottomAnchor, constant: -10), - label.leadingAnchor.constraint(equalTo: view.leadingAnchor, constant: 10), - label.trailingAnchor.constraint(equalTo: view.trailingAnchor, constant: -10), + actualView.topAnchor.constraint(equalTo: view.topAnchor, constant: 10), + actualView.bottomAnchor.constraint(equalTo: view.bottomAnchor, constant: -10), + actualView.leadingAnchor.constraint(equalTo: view.leadingAnchor, constant: 10), + actualView.trailingAnchor.constraint(equalTo: view.trailingAnchor, constant: -10), ]) contentViewController?.view = view