forked from github_mirror/framelesshelper
macos: minor improvements
Signed-off-by: Yuhang Zhao <2546789017@qq.com>
This commit is contained in:
parent
7a65ce04ee
commit
bfc7b27900
|
@ -28,6 +28,7 @@
|
||||||
#include <QtGui/qwindow.h>
|
#include <QtGui/qwindow.h>
|
||||||
#include "framelessmanager.h"
|
#include "framelessmanager.h"
|
||||||
#include "framelessmanager_p.h"
|
#include "framelessmanager_p.h"
|
||||||
|
#include "framelessconfig_p.h"
|
||||||
#include "utils.h"
|
#include "utils.h"
|
||||||
|
|
||||||
FRAMELESSHELPER_BEGIN_NAMESPACE
|
FRAMELESSHELPER_BEGIN_NAMESPACE
|
||||||
|
@ -73,7 +74,20 @@ void FramelessHelperQt::addWindow(const SystemParameters ¶ms)
|
||||||
data.eventFilter = new FramelessHelperQt(window);
|
data.eventFilter = new FramelessHelperQt(window);
|
||||||
g_qtHelper()->data.insert(windowId, data);
|
g_qtHelper()->data.insert(windowId, data);
|
||||||
g_qtHelper()->mutex.unlock();
|
g_qtHelper()->mutex.unlock();
|
||||||
|
const bool shouldApplyFramelessFlag = [¶ms]() -> bool {
|
||||||
|
#ifdef Q_OS_MACOS
|
||||||
|
if (FramelessConfig::instance()->isSet(Option::WindowUseRoundCorners)
|
||||||
|
&& (params.getCurrentApplicationType() == ApplicationType::Quick)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
#else
|
||||||
|
Q_UNUSED(params);
|
||||||
|
#endif
|
||||||
|
return true;
|
||||||
|
}();
|
||||||
|
if (shouldApplyFramelessFlag) {
|
||||||
params.setWindowFlags(params.getWindowFlags() | Qt::FramelessWindowHint);
|
params.setWindowFlags(params.getWindowFlags() | Qt::FramelessWindowHint);
|
||||||
|
}
|
||||||
window->installEventFilter(data.eventFilter);
|
window->installEventFilter(data.eventFilter);
|
||||||
#ifdef Q_OS_MACOS
|
#ifdef Q_OS_MACOS
|
||||||
Utils::setSystemTitleBarVisible(windowId, false);
|
Utils::setSystemTitleBarVisible(windowId, false);
|
||||||
|
|
|
@ -163,6 +163,7 @@ public:
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
nsview.wantsLayer = YES;
|
nsview.wantsLayer = YES;
|
||||||
|
nswindow.styleMask |= NSWindowStyleMaskResizable;
|
||||||
if (visible) {
|
if (visible) {
|
||||||
nswindow.styleMask &= ~NSWindowStyleMaskFullSizeContentView;
|
nswindow.styleMask &= ~NSWindowStyleMaskFullSizeContentView;
|
||||||
} else {
|
} else {
|
||||||
|
|
Loading…
Reference in New Issue