From a56831e8d00c58108a6b4ea6caf1c4e9cfe7f838 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Fri, 10 Feb 2023 23:55:25 +0400 Subject: [PATCH] Fix deprecated declarations warnings on macOS --- ui/platform/mac/ui_utility_mac.mm | 2 +- ui/platform/mac/ui_window_mac.mm | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ui/platform/mac/ui_utility_mac.mm b/ui/platform/mac/ui_utility_mac.mm index 09147a7..2b188d4 100644 --- a/ui/platform/mac/ui_utility_mac.mm +++ b/ui/platform/mac/ui_utility_mac.mm @@ -72,7 +72,7 @@ void ShowOverAll(not_null widget, bool canFocus) { NSWindow *wnd = [reinterpret_cast(widget->winId()) window]; [wnd setLevel:NSPopUpMenuWindowLevel]; if (!canFocus) { - [wnd setStyleMask:NSUtilityWindowMask | NSNonactivatingPanelMask]; + [wnd setStyleMask:NSWindowStyleMaskUtilityWindow | NSWindowStyleMaskNonactivatingPanel]; [wnd setCollectionBehavior:NSWindowCollectionBehaviorMoveToActiveSpace|NSWindowCollectionBehaviorStationary|NSWindowCollectionBehaviorFullScreenAuxiliary|NSWindowCollectionBehaviorIgnoresCycle]; } } diff --git a/ui/platform/mac/ui_window_mac.mm b/ui/platform/mac/ui_window_mac.mm index 4d8bf20..a436206 100644 --- a/ui/platform/mac/ui_window_mac.mm +++ b/ui/platform/mac/ui_window_mac.mm @@ -202,7 +202,7 @@ QRect WindowHelper::Private::controlsRect() const { bool WindowHelper::Private::checkNativeMove(void *nswindow) const { if (_nativeWindow != nswindow - || ([_nativeWindow styleMask] & NSFullScreenWindowMask) == NSFullScreenWindowMask) { + || ([_nativeWindow styleMask] & NSWindowStyleMaskFullScreen) == NSWindowStyleMaskFullScreen) { return false; } const auto cgReal = [NSEvent mouseLocation]; @@ -254,7 +254,7 @@ Fn WindowHelper::Private::enforceStyleCallback() { void WindowHelper::Private::enforceStyle() { if (_nativeWindow && _customTitleHeight > 0) { - [_nativeWindow setStyleMask:[_nativeWindow styleMask] | NSFullSizeContentViewWindowMask]; + [_nativeWindow setStyleMask:[_nativeWindow styleMask] | NSWindowStyleMaskFullSizeContentView]; } } @@ -292,7 +292,7 @@ void WindowHelper::Private::initCustomTitle() { // Emulate custom title instead (code below). // // Tried to backport a fix, testing. - [_nativeWindow setStyleMask:[_nativeWindow styleMask] | NSFullSizeContentViewWindowMask]; + [_nativeWindow setStyleMask:[_nativeWindow styleMask] | NSWindowStyleMaskFullSizeContentView]; auto inner = [_nativeWindow contentLayoutRect]; auto full = [_nativeView frame]; _customTitleHeight = qMax(qRound(full.size.height - inner.size.height), 0);