kotatogram/lib_ui
1
0
Fork 0
Code Issues Activity

Fix deprecated declarations warnings on macOS

Browse source
This commit is contained in:
Ilya Fedin 2023-02-10 23:55:25 +04:00 • committed by John Preston
parent a3bcd2fac4
commit a56831e8d0
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ui/platform/mac/ui_utility_mac.mm
View file

@ -72,7 +72,7 @@ void ShowOverAll(not_null<QWidget*> widget, bool canFocus) {
NSWindow *wnd = [reinterpret_cast<NSView*>(widget->winId()) window]; NSWindow *wnd = [reinterpret_cast<NSView*>(widget->winId()) window];
[wnd setLevel:NSPopUpMenuWindowLevel]; [wnd setLevel:NSPopUpMenuWindowLevel];
if (!canFocus) { if (!canFocus) {
[wnd setStyleMask:NSUtilityWindowMask | NSNonactivatingPanelMask]; [wnd setStyleMask:NSWindowStyleMaskUtilityWindow | NSWindowStyleMaskNonactivatingPanel];
[wnd setCollectionBehavior:NSWindowCollectionBehaviorMoveToActiveSpace|NSWindowCollectionBehaviorStationary|NSWindowCollectionBehaviorFullScreenAuxiliary|NSWindowCollectionBehaviorIgnoresCycle]; [wnd setCollectionBehavior:NSWindowCollectionBehaviorMoveToActiveSpace|NSWindowCollectionBehaviorStationary|NSWindowCollectionBehaviorFullScreenAuxiliary|NSWindowCollectionBehaviorIgnoresCycle];
} }
} }

6
ui/platform/mac/ui_window_mac.mm
View file

@ -202,7 +202,7 @@ QRect WindowHelper::Private::controlsRect() const {
bool WindowHelper::Private::checkNativeMove(void *nswindow) const { bool WindowHelper::Private::checkNativeMove(void *nswindow) const {
if (_nativeWindow != nswindow if (_nativeWindow != nswindow
|| ([_nativeWindow styleMask] & NSFullScreenWindowMask) == NSFullScreenWindowMask) { || ([_nativeWindow styleMask] & NSWindowStyleMaskFullScreen) == NSWindowStyleMaskFullScreen) {
return false; return false;
} }
const auto cgReal = [NSEvent mouseLocation]; const auto cgReal = [NSEvent mouseLocation];
@ -254,7 +254,7 @@ Fn<void()> WindowHelper::Private::enforceStyleCallback() {
void WindowHelper::Private::enforceStyle() { void WindowHelper::Private::enforceStyle() {
if (_nativeWindow && _customTitleHeight > 0) { 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). // Emulate custom title instead (code below).
// //
// Tried to backport a fix, testing. // Tried to backport a fix, testing.
[_nativeWindow setStyleMask:[_nativeWindow styleMask] | NSFullSizeContentViewWindowMask]; [_nativeWindow setStyleMask:[_nativeWindow styleMask] | NSWindowStyleMaskFullSizeContentView];
auto inner = [_nativeWindow contentLayoutRect]; auto inner = [_nativeWindow contentLayoutRect];
auto full = [_nativeView frame]; auto full = [_nativeView frame];
_customTitleHeight = qMax(qRound(full.size.height - inner.size.height), 0); _customTitleHeight = qMax(qRound(full.size.height - inner.size.height), 0);