[vlc-commits] [Git][videolan/vlc][master] macosx: remove dead macOS 10.12/10.13 availability checks in windows, menu
Felix Paul Kühne (@fkuehne)
gitlab at videolan.org
Mon Jun 29 09:38:26 UTC 2026
Felix Paul Kühne pushed to branch master at VideoLAN / VLC
Commits:
f95729fb by Serhii Bykov at 2026-06-29T11:26:23+02:00
macosx: remove dead macOS 10.12/10.13 availability checks in windows, menu
- - - - -
3 changed files:
- modules/gui/macosx/menus/VLCStatusBarIcon.m
- modules/gui/macosx/windows/VLCHelpWindowController.m
- modules/gui/macosx/windows/video/VLCWindow.m
Changes:
=====================================
modules/gui/macosx/menus/VLCStatusBarIcon.m
=====================================
@@ -185,18 +185,14 @@
// Attach pull-down menu
[self.statusItem setMenu:_vlcStatusBarIconMenu];
- if (@available(macOS 10.12, *)) {
- [self.statusItem setBehavior:NSStatusItemBehaviorRemovalAllowed];
- [self.statusItem setAutosaveName:@"statusBarItem"];
- [self.statusItem addObserver:self forKeyPath:NSStringFromSelector(@selector(isVisible))
- options:NSKeyValueObservingOptionNew context:NULL];
- }
+ [self.statusItem setBehavior:NSStatusItemBehaviorRemovalAllowed];
+ [self.statusItem setAutosaveName:@"statusBarItem"];
+ [self.statusItem addObserver:self forKeyPath:NSStringFromSelector(@selector(isVisible))
+ options:NSKeyValueObservingOptionNew context:NULL];
}
- if (@available(macOS 10.12, *)) {
- // Sync VLC setting with status bar visibility setting (10.12 runtime only)
- [self.statusItem setVisible:YES];
- }
+ // Sync VLC setting with status bar visibility setting
+ [self.statusItem setVisible:YES];
}
- (void)disableStatusItem
@@ -204,13 +200,7 @@
if (!self.statusItem)
return;
- // Lets keep alive the object in Sierra, and destroy it in older OS versions
- if (@available(macOS 10.12, *)) {
- self.statusItem.visible = NO;
- } else {
- [[NSStatusBar systemStatusBar] removeStatusItem:self.statusItem];
- self.statusItem = nil;
- }
+ self.statusItem.visible = NO;
}
- (void)dealloc
=====================================
modules/gui/macosx/windows/VLCHelpWindowController.m
=====================================
@@ -45,10 +45,8 @@
- (void)windowDidLoad
{
self.window.title = _NS("VLC media player Help");
- if (@available(macOS 10.12, *)) {
- self.window.tabbingMode = NSWindowTabbingModeDisallowed;
- }
-
+ self.window.tabbingMode = NSWindowTabbingModeDisallowed;
+
_helpWebView = [[WKWebView alloc] initWithFrame:self.window.contentView.bounds];
self.helpWebView.navigationDelegate = self;
self.helpWebView.translatesAutoresizingMaskIntoConstraints = NO;
=====================================
modules/gui/macosx/windows/video/VLCWindow.m
=====================================
@@ -55,9 +55,7 @@
/* we don't want this window to be restored on relaunch */
[self setRestorable:NO];
- if (@available(macOS 10.12, *)) {
- self.tabbingMode = NSWindowTabbingModeDisallowed;
- }
+ self.tabbingMode = NSWindowTabbingModeDisallowed;
}
return self;
}
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/f95729fbeb1c72593715d013a5d6765ce06c5252
--
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/f95729fbeb1c72593715d013a5d6765ce06c5252
You're receiving this email because of your account on code.videolan.org. Manage all notifications: https://code.videolan.org/-/profile/notifications | Help: https://code.videolan.org/help
More information about the vlc-commits
mailing list