Mentalflow
/
framelesshelper
forked from github_mirror/framelesshelper
1
0
Fork 0
Code Pull Requests Activity

widgets module: fix two issues 

1. The top border has a one pixel gap under some circumstances, fixed
2. The zoomed property didn't get notified correctly sometimes, fixed

Signed-off-by: Yuhang Zhao <2546789017@qq.com>
This commit is contained in:
Yuhang Zhao 2022-04-22 12:57:00 +08:00
parent 3f17626c64
commit 201f54e7a5
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/widgets/framelesswidgetshelper.cpp
View File

@ -241,6 +241,11 @@ void FramelessWidgetsHelper::changeEventHandler(QEvent *event)
updateSystemTitleBarStyleSheet(); updateSystemTitleBarStyleSheet();
} }
q->update(); q->update();
if (type == QEvent::WindowStateChange) {
QMetaObject::invokeMethod(q, "hiddenChanged");
QMetaObject::invokeMethod(q, "normalChanged");
QMetaObject::invokeMethod(q, "zoomedChanged");
}
} }
void FramelessWidgetsHelper::paintEventHandler(QPaintEvent *event) void FramelessWidgetsHelper::paintEventHandler(QPaintEvent *event)
@ -259,7 +264,11 @@ void FramelessWidgetsHelper::paintEventHandler(QPaintEvent *event)
pen.setColor(Utils::getFrameBorderColor(q->isActiveWindow())); pen.setColor(Utils::getFrameBorderColor(q->isActiveWindow()));
pen.setWidth(1); pen.setWidth(1);
painter.setPen(pen); painter.setPen(pen);
painter.drawLine(0, 0, (q->width() - 1), 0); // We should use "q->width() - 1" actually but we can't because
// Qt's drawing system have some rounding error internally and
// if we minus one here we'll get a one pixel gap, so sad. But
// drawing a line with extra pixels won't hurt anyway.
painter.drawLine(0, 0, q->width(), 0);
painter.restore(); painter.restore();
#else #else
Q_UNUSED(event); Q_UNUSED(event);
@ -468,11 +477,6 @@ void FramelessWidgetsHelper::initialize()
} }
QMetaObject::invokeMethod(q, "systemThemeChanged"); QMetaObject::invokeMethod(q, "systemThemeChanged");
}); });
connect(q->windowHandle(), &QWindow::visibilityChanged, this, [this](){
QMetaObject::invokeMethod(q, "hiddenChanged");
QMetaObject::invokeMethod(q, "normalChanged");
QMetaObject::invokeMethod(q, "zoomedChanged");
});
setupInitialUi(); setupInitialUi();
if (m_settings.options & Option::CreateStandardWindowLayout) { if (m_settings.options & Option::CreateStandardWindowLayout) {
m_settings.minimizeButton = m_systemMinimizeButton.data(); m_settings.minimizeButton = m_systemMinimizeButton.data();