diff --git a/resources/icons/preferences/appearance/app_icons_hide_app_badges_light@2x.png b/resources/icons/preferences/appearance/app_icons_hide_app_badges_light@2x.png index 06bf56fc..e220a7d3 100644 Binary files a/resources/icons/preferences/appearance/app_icons_hide_app_badges_light@2x.png and b/resources/icons/preferences/appearance/app_icons_hide_app_badges_light@2x.png differ diff --git a/resources/icons/preferences/appearance/app_icons_hide_preview_focused_window_light@2x.png b/resources/icons/preferences/appearance/app_icons_hide_preview_focused_window_light@2x.png index 46910153..c9f715cd 100644 Binary files a/resources/icons/preferences/appearance/app_icons_hide_preview_focused_window_light@2x.png and b/resources/icons/preferences/appearance/app_icons_hide_preview_focused_window_light@2x.png differ diff --git a/resources/icons/preferences/appearance/app_icons_hide_tabs_as_windows_light@2x.png b/resources/icons/preferences/appearance/app_icons_hide_tabs_as_windows_light@2x.png index dc1abafd..1fe2919a 100644 Binary files a/resources/icons/preferences/appearance/app_icons_hide_tabs_as_windows_light@2x.png and b/resources/icons/preferences/appearance/app_icons_hide_tabs_as_windows_light@2x.png differ diff --git a/resources/icons/preferences/appearance/app_icons_hide_windowless_apps_light@2x.png b/resources/icons/preferences/appearance/app_icons_hide_windowless_apps_light@2x.png index 5586469e..9457993e 100644 Binary files a/resources/icons/preferences/appearance/app_icons_hide_windowless_apps_light@2x.png and b/resources/icons/preferences/appearance/app_icons_hide_windowless_apps_light@2x.png differ diff --git a/resources/icons/preferences/appearance/app_icons_light@2x.png b/resources/icons/preferences/appearance/app_icons_light@2x.png index 06bf56fc..e220a7d3 100644 Binary files a/resources/icons/preferences/appearance/app_icons_light@2x.png and b/resources/icons/preferences/appearance/app_icons_light@2x.png differ diff --git a/resources/icons/preferences/appearance/app_icons_show_app_badges_light@2x.png b/resources/icons/preferences/appearance/app_icons_show_app_badges_light@2x.png index e37a167a..86238e7e 100644 Binary files a/resources/icons/preferences/appearance/app_icons_show_app_badges_light@2x.png and b/resources/icons/preferences/appearance/app_icons_show_app_badges_light@2x.png differ diff --git a/resources/icons/preferences/appearance/app_icons_show_preview_focused_window_light@2x.png b/resources/icons/preferences/appearance/app_icons_show_preview_focused_window_light@2x.png index 206a67d6..2a2044d3 100644 Binary files a/resources/icons/preferences/appearance/app_icons_show_preview_focused_window_light@2x.png and b/resources/icons/preferences/appearance/app_icons_show_preview_focused_window_light@2x.png differ diff --git a/resources/icons/preferences/appearance/app_icons_show_tabs_as_windows_light@2x.png b/resources/icons/preferences/appearance/app_icons_show_tabs_as_windows_light@2x.png index 82ee7c33..f867e09b 100644 Binary files a/resources/icons/preferences/appearance/app_icons_show_tabs_as_windows_light@2x.png and b/resources/icons/preferences/appearance/app_icons_show_tabs_as_windows_light@2x.png differ diff --git a/resources/icons/preferences/appearance/app_icons_show_windowless_apps_light@2x.png b/resources/icons/preferences/appearance/app_icons_show_windowless_apps_light@2x.png index 06bf56fc..e220a7d3 100644 Binary files a/resources/icons/preferences/appearance/app_icons_show_windowless_apps_light@2x.png and b/resources/icons/preferences/appearance/app_icons_show_windowless_apps_light@2x.png differ diff --git a/resources/icons/preferences/appearance/thumbnails_hide_app_badges_light@2x.png b/resources/icons/preferences/appearance/thumbnails_hide_app_badges_light@2x.png index aa106190..f60c5f6e 100644 Binary files a/resources/icons/preferences/appearance/thumbnails_hide_app_badges_light@2x.png and b/resources/icons/preferences/appearance/thumbnails_hide_app_badges_light@2x.png differ diff --git a/resources/icons/preferences/appearance/thumbnails_hide_colored_circles_light@2x.png b/resources/icons/preferences/appearance/thumbnails_hide_colored_circles_light@2x.png index 54d99e84..09ca9d23 100644 Binary files a/resources/icons/preferences/appearance/thumbnails_hide_colored_circles_light@2x.png and b/resources/icons/preferences/appearance/thumbnails_hide_colored_circles_light@2x.png differ diff --git a/resources/icons/preferences/appearance/thumbnails_hide_preview_focused_window_light@2x.png b/resources/icons/preferences/appearance/thumbnails_hide_preview_focused_window_light@2x.png index 46993140..6b3eddd8 100644 Binary files a/resources/icons/preferences/appearance/thumbnails_hide_preview_focused_window_light@2x.png and b/resources/icons/preferences/appearance/thumbnails_hide_preview_focused_window_light@2x.png differ diff --git a/resources/icons/preferences/appearance/thumbnails_hide_space_number_labels_light@2x.png b/resources/icons/preferences/appearance/thumbnails_hide_space_number_labels_light@2x.png index 21834aa0..7db52193 100644 Binary files a/resources/icons/preferences/appearance/thumbnails_hide_space_number_labels_light@2x.png and b/resources/icons/preferences/appearance/thumbnails_hide_space_number_labels_light@2x.png differ diff --git a/resources/icons/preferences/appearance/thumbnails_hide_status_icons_light@2x.png b/resources/icons/preferences/appearance/thumbnails_hide_status_icons_light@2x.png index 68c65e52..557196fb 100644 Binary files a/resources/icons/preferences/appearance/thumbnails_hide_status_icons_light@2x.png and b/resources/icons/preferences/appearance/thumbnails_hide_status_icons_light@2x.png differ diff --git a/resources/icons/preferences/appearance/thumbnails_hide_tabs_as_windows_light@2x.png b/resources/icons/preferences/appearance/thumbnails_hide_tabs_as_windows_light@2x.png index 9f09d246..3642d4db 100644 Binary files a/resources/icons/preferences/appearance/thumbnails_hide_tabs_as_windows_light@2x.png and b/resources/icons/preferences/appearance/thumbnails_hide_tabs_as_windows_light@2x.png differ diff --git a/resources/icons/preferences/appearance/thumbnails_hide_windowless_apps_light@2x.png b/resources/icons/preferences/appearance/thumbnails_hide_windowless_apps_light@2x.png index 9b9d5096..cf22fae4 100644 Binary files a/resources/icons/preferences/appearance/thumbnails_hide_windowless_apps_light@2x.png and b/resources/icons/preferences/appearance/thumbnails_hide_windowless_apps_light@2x.png differ diff --git a/resources/icons/preferences/appearance/thumbnails_light@2x.png b/resources/icons/preferences/appearance/thumbnails_light@2x.png index 0e55e41d..7c342629 100644 Binary files a/resources/icons/preferences/appearance/thumbnails_light@2x.png and b/resources/icons/preferences/appearance/thumbnails_light@2x.png differ diff --git a/resources/icons/preferences/appearance/thumbnails_show_app_badges_light@2x.png b/resources/icons/preferences/appearance/thumbnails_show_app_badges_light@2x.png index 7fa79944..b12cfd5a 100644 Binary files a/resources/icons/preferences/appearance/thumbnails_show_app_badges_light@2x.png and b/resources/icons/preferences/appearance/thumbnails_show_app_badges_light@2x.png differ diff --git a/resources/icons/preferences/appearance/thumbnails_show_colored_circles_light@2x.png b/resources/icons/preferences/appearance/thumbnails_show_colored_circles_light@2x.png index d2fac21c..d1ab264f 100644 Binary files a/resources/icons/preferences/appearance/thumbnails_show_colored_circles_light@2x.png and b/resources/icons/preferences/appearance/thumbnails_show_colored_circles_light@2x.png differ diff --git a/resources/icons/preferences/appearance/thumbnails_show_preview_focused_window_light@2x.png b/resources/icons/preferences/appearance/thumbnails_show_preview_focused_window_light@2x.png index 9d67e6b0..87fdeb7d 100644 Binary files a/resources/icons/preferences/appearance/thumbnails_show_preview_focused_window_light@2x.png and b/resources/icons/preferences/appearance/thumbnails_show_preview_focused_window_light@2x.png differ diff --git a/resources/icons/preferences/appearance/thumbnails_show_space_number_labels_light@2x.png b/resources/icons/preferences/appearance/thumbnails_show_space_number_labels_light@2x.png index a09fb116..3b5b64e2 100644 Binary files a/resources/icons/preferences/appearance/thumbnails_show_space_number_labels_light@2x.png and b/resources/icons/preferences/appearance/thumbnails_show_space_number_labels_light@2x.png differ diff --git a/resources/icons/preferences/appearance/thumbnails_show_status_icons_light@2x.png b/resources/icons/preferences/appearance/thumbnails_show_status_icons_light@2x.png index ff736ad1..f3dd5cd6 100644 Binary files a/resources/icons/preferences/appearance/thumbnails_show_status_icons_light@2x.png and b/resources/icons/preferences/appearance/thumbnails_show_status_icons_light@2x.png differ diff --git a/resources/icons/preferences/appearance/thumbnails_show_tabs_as_windows_light@2x.png b/resources/icons/preferences/appearance/thumbnails_show_tabs_as_windows_light@2x.png index c9a48ed5..dea3d32c 100644 Binary files a/resources/icons/preferences/appearance/thumbnails_show_tabs_as_windows_light@2x.png and b/resources/icons/preferences/appearance/thumbnails_show_tabs_as_windows_light@2x.png differ diff --git a/resources/icons/preferences/appearance/thumbnails_show_windowless_apps_light@2x.png b/resources/icons/preferences/appearance/thumbnails_show_windowless_apps_light@2x.png index cfb8a794..b0bd71e7 100644 Binary files a/resources/icons/preferences/appearance/thumbnails_show_windowless_apps_light@2x.png and b/resources/icons/preferences/appearance/thumbnails_show_windowless_apps_light@2x.png differ diff --git a/resources/icons/preferences/appearance/titles_hide_app_badges_light@2x.png b/resources/icons/preferences/appearance/titles_hide_app_badges_light@2x.png index da5dc220..0088d8bd 100644 Binary files a/resources/icons/preferences/appearance/titles_hide_app_badges_light@2x.png and b/resources/icons/preferences/appearance/titles_hide_app_badges_light@2x.png differ diff --git a/resources/icons/preferences/appearance/titles_hide_preview_focused_window_light@2x.png b/resources/icons/preferences/appearance/titles_hide_preview_focused_window_light@2x.png index d525fcce..193583ed 100644 Binary files a/resources/icons/preferences/appearance/titles_hide_preview_focused_window_light@2x.png and b/resources/icons/preferences/appearance/titles_hide_preview_focused_window_light@2x.png differ diff --git a/resources/icons/preferences/appearance/titles_hide_space_number_labels_light@2x.png b/resources/icons/preferences/appearance/titles_hide_space_number_labels_light@2x.png index 1cc09569..57f712cc 100644 Binary files a/resources/icons/preferences/appearance/titles_hide_space_number_labels_light@2x.png and b/resources/icons/preferences/appearance/titles_hide_space_number_labels_light@2x.png differ diff --git a/resources/icons/preferences/appearance/titles_hide_status_icons_light@2x.png b/resources/icons/preferences/appearance/titles_hide_status_icons_light@2x.png index e33d4cca..f52c31b1 100644 Binary files a/resources/icons/preferences/appearance/titles_hide_status_icons_light@2x.png and b/resources/icons/preferences/appearance/titles_hide_status_icons_light@2x.png differ diff --git a/resources/icons/preferences/appearance/titles_hide_tabs_as_windows_light@2x.png b/resources/icons/preferences/appearance/titles_hide_tabs_as_windows_light@2x.png index 47cd4baa..37172558 100644 Binary files a/resources/icons/preferences/appearance/titles_hide_tabs_as_windows_light@2x.png and b/resources/icons/preferences/appearance/titles_hide_tabs_as_windows_light@2x.png differ diff --git a/resources/icons/preferences/appearance/titles_hide_windowless_apps_light@2x.png b/resources/icons/preferences/appearance/titles_hide_windowless_apps_light@2x.png index 63f79148..096d7cf4 100644 Binary files a/resources/icons/preferences/appearance/titles_hide_windowless_apps_light@2x.png and b/resources/icons/preferences/appearance/titles_hide_windowless_apps_light@2x.png differ diff --git a/resources/icons/preferences/appearance/titles_light@2x.png b/resources/icons/preferences/appearance/titles_light@2x.png index da5dc220..0088d8bd 100644 Binary files a/resources/icons/preferences/appearance/titles_light@2x.png and b/resources/icons/preferences/appearance/titles_light@2x.png differ diff --git a/resources/icons/preferences/appearance/titles_show_app_badges_light@2x.png b/resources/icons/preferences/appearance/titles_show_app_badges_light@2x.png index e023743f..0a371e16 100644 Binary files a/resources/icons/preferences/appearance/titles_show_app_badges_light@2x.png and b/resources/icons/preferences/appearance/titles_show_app_badges_light@2x.png differ diff --git a/resources/icons/preferences/appearance/titles_show_preview_focused_window_light@2x.png b/resources/icons/preferences/appearance/titles_show_preview_focused_window_light@2x.png index 46f8089d..f405547e 100644 Binary files a/resources/icons/preferences/appearance/titles_show_preview_focused_window_light@2x.png and b/resources/icons/preferences/appearance/titles_show_preview_focused_window_light@2x.png differ diff --git a/resources/icons/preferences/appearance/titles_show_space_number_labels_light@2x.png b/resources/icons/preferences/appearance/titles_show_space_number_labels_light@2x.png index 7a3e8b93..73957ee7 100644 Binary files a/resources/icons/preferences/appearance/titles_show_space_number_labels_light@2x.png and b/resources/icons/preferences/appearance/titles_show_space_number_labels_light@2x.png differ diff --git a/resources/icons/preferences/appearance/titles_show_status_icons_light@2x.png b/resources/icons/preferences/appearance/titles_show_status_icons_light@2x.png index b91f5070..cdb8cc28 100644 Binary files a/resources/icons/preferences/appearance/titles_show_status_icons_light@2x.png and b/resources/icons/preferences/appearance/titles_show_status_icons_light@2x.png differ diff --git a/resources/icons/preferences/appearance/titles_show_tabs_as_windows_light@2x.png b/resources/icons/preferences/appearance/titles_show_tabs_as_windows_light@2x.png index 00e4db3f..2284c4ae 100644 Binary files a/resources/icons/preferences/appearance/titles_show_tabs_as_windows_light@2x.png and b/resources/icons/preferences/appearance/titles_show_tabs_as_windows_light@2x.png differ diff --git a/resources/icons/preferences/appearance/titles_show_windowless_apps_light@2x.png b/resources/icons/preferences/appearance/titles_show_windowless_apps_light@2x.png index 14eb02a9..b34f511e 100644 Binary files a/resources/icons/preferences/appearance/titles_show_windowless_apps_light@2x.png and b/resources/icons/preferences/appearance/titles_show_windowless_apps_light@2x.png differ diff --git a/src/ui/preferences-window/tabs/AppearanceTab.swift b/src/ui/preferences-window/tabs/AppearanceTab.swift index 1cbc7fa8..626369fc 100644 --- a/src/ui/preferences-window/tabs/AppearanceTab.swift +++ b/src/ui/preferences-window/tabs/AppearanceTab.swift @@ -17,7 +17,7 @@ struct ShowHideRowInfo { class ShowHideIllustratedView { private let model: AppearanceModelPreference - private let showHideCellWidth = CGFloat(400) + private let showHideCellWidth = CGFloat(600) private var showHideRows = [ShowHideRowInfo]() private var grid: GridView! @@ -28,8 +28,9 @@ class ShowHideIllustratedView { func setupView() -> GridView { // Add the illustrated image first + let shrinkWidth: CGFloat = 50 var settings: [[NSView]] = [ - [makeIllustratedImageView(model)], + [makeIllustratedImageView(model, showHideCellWidth - shrinkWidth)], ] var modelToRows = [Int: ShowHideRowInfo]() var index = 1 @@ -187,7 +188,7 @@ class ShowHideIllustratedView { hoverView.addSubview(contentView) contentView.translatesAutoresizingMaskIntoConstraints = false NSLayoutConstraint.activate([ - hoverView.widthAnchor.constraint(equalToConstant: grid.column(at: 0).width - GridView.padding), + hoverView.widthAnchor.constraint(equalToConstant: grid.column(at: 0).width), contentView.topAnchor.constraint(equalTo: hoverView.topAnchor, constant: 10), contentView.bottomAnchor.constraint(equalTo: hoverView.bottomAnchor, constant: -10), contentView.leadingAnchor.constraint(equalTo: hoverView.leadingAnchor, constant: 10), @@ -199,7 +200,7 @@ class ShowHideIllustratedView { } } - private func makeIllustratedImageView(_ model: AppearanceModelPreference) -> NSView { + private func makeIllustratedImageView(_ model: AppearanceModelPreference, _ imageWidth: CGFloat) -> NSView { // TODO: The appearance theme functionality has not been implemented yet. // We will implement it later; for now, use the light theme. let imageName = model.image.name + "_light" @@ -217,7 +218,7 @@ class ShowHideIllustratedView { wrapView.layer?.borderColor = NSColor.lightGray.withAlphaComponent(0.2).cgColor wrapView.layer?.borderWidth = 2.0 - let imageWidth = showHideCellWidth - 100 + let imageWidth = imageWidth let imageHeight = imageWidth / 1.6 NSLayoutConstraint.activate([ imageView.widthAnchor.constraint(equalToConstant: imageWidth), @@ -384,24 +385,24 @@ class ModelAdvancedSettingsWindow: NSWindow, NSTabViewDelegate { // Delegate method for tab view, it will be called when new tab is selected. func tabView(_ tabView: NSTabView, didSelect tabViewItem: NSTabViewItem?) { - if let grid = tabView.superview as? GridView, let tabView = tabView as? TabView { - if let window = tabView.window as? ModelAdvancedSettingsWindow { - // Adjust the size of the tabView to fit its content - tabView.widthAnchor.constraint(equalToConstant: tabView.maxIntrinsicContentSize().width + GridView.padding).isActive = true - let newSize = grid.fittingSize - - if let parentWindow = window.sheetParent { - // Get parent window frame - let parentFrame = parentWindow.frame - var frame = window.frame - frame.size.height = newSize.height - frame.origin.y = parentFrame.origin.y + parentFrame.height - newSize.height - - window.setFrame(frame, display: true, animate: true) - window.layoutIfNeeded() - } - } - } +// if let grid = tabView.superview as? GridView, let tabView = tabView as? TabView { +// if let window = tabView.window as? ModelAdvancedSettingsWindow { +// // Adjust the size of the tabView to fit its content +// tabView.widthAnchor.constraint(equalToConstant: tabView.maxIntrinsicContentSize().width + GridView.padding).isActive = true +// let newSize = grid.fittingSize +// +// if let parentWindow = window.sheetParent { +// // Get parent window frame +// let parentFrame = parentWindow.frame +// var frame = window.frame +// frame.size.height = newSize.height +// frame.origin.y = parentFrame.origin.y + parentFrame.height - newSize.height +// +// window.setFrame(frame, display: true, animate: true) +// window.layoutIfNeeded() +// } +// } +// } } private func setupThumbnailsView() -> NSView {