github_mirror
/
framelesshelper
mirror of https://github.com/wangwenx190/framelesshelper.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Fix the border width of the examples 

Amends commit 3aba956d66

Signed-off-by: Yuhang Zhao <2546789017@qq.com>
This commit is contained in:
Yuhang Zhao 2021-11-19 14:29:44 +08:00
parent 3aba956d66
commit 2fafa7a433
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/mainwindow/mainwindow.cpp
View File

@ -142,7 +142,7 @@ void MainWindow::paintEvent(QPaintEvent *event)
|| (area == ColorizationArea::All)); || (area == ColorizationArea::All));
const QColor borderColor = (isActiveWindow() ? (colorizedBorder ? Utilities::getColorizationColor() : Qt::black) : Qt::darkGray); const QColor borderColor = (isActiveWindow() ? (colorizedBorder ? Utilities::getColorizationColor() : Qt::black) : Qt::darkGray);
const auto borderThickness = static_cast<qreal>(Utilities::getWindowVisibleFrameBorderThickness(winId())); const auto borderThickness = static_cast<qreal>(Utilities::getWindowVisibleFrameBorderThickness(winId()));
painter.setPen({borderColor, qMax(borderThickness, devicePixelRatioF())}); painter.setPen({borderColor, borderThickness});
painter.drawLines(lines); painter.drawLines(lines);
painter.restore(); painter.restore();
} }

2
examples/quick/qml/main.qml
View File

@ -36,7 +36,7 @@ Window {
title: qsTr("Hello, World!") title: qsTr("Hello, World!")
color: "#f0f0f0" color: "#f0f0f0"
property real _flh_margin: ((window.visibility === Window.Maximized) | (window.visibility === Window.FullScreen)) ? 0.0 : Math.max(1.0, Screen.devicePixelRatio) property real _flh_margin: ((window.visibility === Window.Maximized) | (window.visibility === Window.FullScreen)) ? 0.0 : 1.0
property var _win_prev_state: null property var _win_prev_state: null
FramelessHelper { FramelessHelper {

2
examples/widget/widget.cpp
View File

@ -158,7 +158,7 @@ void Widget::paintEvent(QPaintEvent *event)
|| (area == ColorizationArea::All)); || (area == ColorizationArea::All));
const QColor borderColor = (isActiveWindow() ? (colorizedBorder ? Utilities::getColorizationColor() : Qt::black) : Qt::darkGray); const QColor borderColor = (isActiveWindow() ? (colorizedBorder ? Utilities::getColorizationColor() : Qt::black) : Qt::darkGray);
const auto borderThickness = static_cast<qreal>(Utilities::getWindowVisibleFrameBorderThickness(winId())); const auto borderThickness = static_cast<qreal>(Utilities::getWindowVisibleFrameBorderThickness(winId()));
painter.setPen({borderColor, qMax(borderThickness, devicePixelRatioF())}); painter.setPen({borderColor, borderThickness});
painter.drawLines(lines); painter.drawLines(lines);
painter.restore(); painter.restore();
} }

2
utilities_win32.cpp
View File

@ -329,7 +329,7 @@ int Utilities::getWindowVisibleFrameBorderThickness(const WId winId)
const HRESULT hr = DwmGetWindowAttribute(hWnd, _DWMWA_VISIBLE_FRAME_BORDER_THICKNESS, &value, sizeof(value)); const HRESULT hr = DwmGetWindowAttribute(hWnd, _DWMWA_VISIBLE_FRAME_BORDER_THICKNESS, &value, sizeof(value));
if (SUCCEEDED(hr)) { if (SUCCEEDED(hr)) {
const QWindow *w = findWindow(winId); const QWindow *w = findWindow(winId);
return static_cast<int>(qRound(static_cast<qreal>(value) * (w ? w->devicePixelRatio() : 1.0))); return static_cast<int>(qRound(static_cast<qreal>(value) / (w ? w->devicePixelRatio() : 1.0)));
} else { } else {
// We just eat this error because this enum value was introduced in a very // We just eat this error because this enum value was introduced in a very
// late Windows 10 version, so querying it's value will always result in // late Windows 10 version, so querying it's value will always result in