forked from github_mirror/framelesshelper
Minor improvement
Signed-off-by: Yuhang Zhao <2546789017@qq.com>
This commit is contained in:
parent
4b66c244fc
commit
0a5e5aa67b
|
@ -143,7 +143,9 @@ void QtAcrylicWidget::setAcrylicEnabled(const bool value)
|
||||||
{
|
{
|
||||||
if (m_acrylicEnabled != value) {
|
if (m_acrylicEnabled != value) {
|
||||||
m_acrylicEnabled = value;
|
m_acrylicEnabled = value;
|
||||||
Utilities::setBlurEffectEnabled(windowHandle(), m_acrylicEnabled);
|
if (m_inited) {
|
||||||
|
Utilities::setBlurEffectEnabled(windowHandle(), m_acrylicEnabled);
|
||||||
|
}
|
||||||
setAutoFillBackground(!m_acrylicEnabled);
|
setAutoFillBackground(!m_acrylicEnabled);
|
||||||
setAttribute(Qt::WA_NoSystemBackground, m_acrylicEnabled);
|
setAttribute(Qt::WA_NoSystemBackground, m_acrylicEnabled);
|
||||||
setAttribute(Qt::WA_OpaquePaintEvent, m_acrylicEnabled);
|
setAttribute(Qt::WA_OpaquePaintEvent, m_acrylicEnabled);
|
||||||
|
@ -156,25 +158,25 @@ void QtAcrylicWidget::setAcrylicEnabled(const bool value)
|
||||||
void QtAcrylicWidget::showEvent(QShowEvent *event)
|
void QtAcrylicWidget::showEvent(QShowEvent *event)
|
||||||
{
|
{
|
||||||
QWidget::showEvent(event);
|
QWidget::showEvent(event);
|
||||||
static bool inited = false;
|
if (!m_inited) {
|
||||||
if (!inited) {
|
|
||||||
FramelessWindowsManager::addWindow(windowHandle());
|
FramelessWindowsManager::addWindow(windowHandle());
|
||||||
m_acrylicHelper.install(windowHandle());
|
m_acrylicHelper.install(windowHandle());
|
||||||
m_acrylicHelper.updateAcrylicBrush(tintColor());
|
m_acrylicHelper.updateAcrylicBrush(tintColor());
|
||||||
connect(&m_acrylicHelper, &QtAcrylicEffectHelper::needsRepaint, this, qOverload<>(&QtAcrylicWidget::update));
|
connect(&m_acrylicHelper, &QtAcrylicEffectHelper::needsRepaint, this, qOverload<>(&QtAcrylicWidget::update));
|
||||||
setAcrylicEnabled(true);
|
setAcrylicEnabled(true);
|
||||||
inited = true;
|
m_inited = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void QtAcrylicWidget::paintEvent(QPaintEvent *event)
|
void QtAcrylicWidget::paintEvent(QPaintEvent *event)
|
||||||
{
|
{
|
||||||
QPainter painter(this);
|
QPainter painter(this);
|
||||||
|
const QRect rect = {0, 0, width(), height()};
|
||||||
if (acrylicEnabled()) {
|
if (acrylicEnabled()) {
|
||||||
m_acrylicHelper.paintWindowBackground(&painter, QRect{0, 0, width(), height()});
|
m_acrylicHelper.paintWindowBackground(&painter, rect);
|
||||||
}
|
}
|
||||||
if (frameVisible()) {
|
if (frameVisible()) {
|
||||||
m_acrylicHelper.paintWindowFrame(&painter);
|
m_acrylicHelper.paintWindowFrame(&painter, rect);
|
||||||
}
|
}
|
||||||
QWidget::paintEvent(event);
|
QWidget::paintEvent(event);
|
||||||
}
|
}
|
||||||
|
|
|
@ -82,4 +82,5 @@ private:
|
||||||
QtAcrylicEffectHelper m_acrylicHelper;
|
QtAcrylicEffectHelper m_acrylicHelper;
|
||||||
bool m_frameVisible = true;
|
bool m_frameVisible = true;
|
||||||
bool m_acrylicEnabled = false;
|
bool m_acrylicEnabled = false;
|
||||||
|
bool m_inited = false;
|
||||||
};
|
};
|
||||||
|
|
|
@ -98,6 +98,8 @@ FRAMELESSHELPER_EXPORT void updateQtFrameMargins(QWindow *window, const bool ena
|
||||||
FRAMELESSHELPER_EXPORT quint32 getWindowDpi(const QWindow *window);
|
FRAMELESSHELPER_EXPORT quint32 getWindowDpi(const QWindow *window);
|
||||||
FRAMELESSHELPER_EXPORT QMargins getWindowNativeFrameMargins(const QWindow *window);
|
FRAMELESSHELPER_EXPORT QMargins getWindowNativeFrameMargins(const QWindow *window);
|
||||||
FRAMELESSHELPER_EXPORT QColor getNativeWindowFrameColor(const bool isActive = true);
|
FRAMELESSHELPER_EXPORT QColor getNativeWindowFrameColor(const bool isActive = true);
|
||||||
|
|
||||||
|
FRAMELESSHELPER_EXPORT void displaySystemMenu(const QWindow *window, const QPoint pos = {});
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -713,3 +713,72 @@ bool Utilities::shouldUseTraditionalBlur()
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void Utilities::displaySystemMenu(const QWindow *window, const QPoint pos)
|
||||||
|
{
|
||||||
|
Q_ASSERT(window);
|
||||||
|
if (!window) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const auto hwnd = reinterpret_cast<HWND>(window->winId());
|
||||||
|
Q_ASSERT(hwnd);
|
||||||
|
if (!hwnd) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const HMENU hMenu = GetSystemMenu(hwnd, FALSE);
|
||||||
|
if (!hMenu) {
|
||||||
|
qWarning() << "Failed to acquire the system menu.";
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
MENUITEMINFOW mii;
|
||||||
|
SecureZeroMemory(&mii, sizeof(mii));
|
||||||
|
mii.cbSize = sizeof(mii);
|
||||||
|
mii.fMask = MIIM_STATE;
|
||||||
|
mii.fType = 0;
|
||||||
|
mii.fState = MF_ENABLED;
|
||||||
|
SetMenuItemInfoW(hMenu, SC_RESTORE, FALSE, &mii);
|
||||||
|
SetMenuItemInfoW(hMenu, SC_SIZE, FALSE, &mii);
|
||||||
|
SetMenuItemInfoW(hMenu, SC_MOVE, FALSE, &mii);
|
||||||
|
SetMenuItemInfoW(hMenu, SC_MAXIMIZE, FALSE, &mii);
|
||||||
|
SetMenuItemInfoW(hMenu, SC_MINIMIZE, FALSE, &mii);
|
||||||
|
mii.fState = MF_GRAYED;
|
||||||
|
const auto isMin = [window]{
|
||||||
|
return (window->windowState() == Qt::WindowMinimized);
|
||||||
|
}();
|
||||||
|
const auto isMax = [window]{
|
||||||
|
return (window->windowState() == Qt::WindowMaximized);
|
||||||
|
}();
|
||||||
|
const auto isFull = [window]{
|
||||||
|
return (window->windowState() == Qt::WindowFullScreen);
|
||||||
|
}();
|
||||||
|
const bool isNormal = !isMin && !isMax && !isFull;
|
||||||
|
const auto isFix = [window]{
|
||||||
|
if (window->flags().testFlag(Qt::MSWindowsFixedSizeDialogHint)) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
const QSize minSize = window->minimumSize();
|
||||||
|
const QSize maxSize = window->maximumSize();
|
||||||
|
if (!minSize.isEmpty() && !maxSize.isEmpty() && (minSize == maxSize)) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}();
|
||||||
|
if (isFix || isMax || isFull) {
|
||||||
|
SetMenuItemInfoW(hMenu, SC_SIZE, FALSE, &mii);
|
||||||
|
SetMenuItemInfoW(hMenu, SC_MAXIMIZE, FALSE, &mii);
|
||||||
|
}
|
||||||
|
if (isFix || isFull || isNormal) {
|
||||||
|
SetMenuItemInfoW(hMenu, SC_RESTORE, FALSE, &mii);
|
||||||
|
}
|
||||||
|
if (isMax || isFull) {
|
||||||
|
SetMenuItemInfoW(hMenu, SC_MOVE, FALSE, &mii);
|
||||||
|
}
|
||||||
|
if (isMin) {
|
||||||
|
SetMenuItemInfoW(hMenu, SC_MINIMIZE, FALSE, &mii);
|
||||||
|
}
|
||||||
|
const QPoint point = pos.isNull() ? QCursor::pos(window->screen()) : pos;
|
||||||
|
const LPARAM cmd = TrackPopupMenu(hMenu, (TPM_LEFTBUTTON | TPM_RIGHTBUTTON | TPM_RETURNCMD | TPM_TOPALIGN | TPM_LEFTALIGN), point.x(), point.y(), 0, hwnd, nullptr);
|
||||||
|
if (cmd) {
|
||||||
|
PostMessageW(hwnd, WM_SYSCOMMAND, cmd, 0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in New Issue