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

bump version 

Signed-off-by: Yuhang Zhao <2546789017@qq.com>
This commit is contained in:
Yuhang Zhao 2022-11-29 19:51:33 +08:00
parent 40058a1e79
commit d14a0e62d9
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -25,7 +25,7 @@
cmake_minimum_required(VERSION 3.20) cmake_minimum_required(VERSION 3.20)
project(FramelessHelper project(FramelessHelper
VERSION 2.3.4.0 VERSION 2.3.5.0
DESCRIPTION "Cross-platform window customization framework for Qt Widgets and Qt Quick." DESCRIPTION "Cross-platform window customization framework for Qt Widgets and Qt Quick."
HOMEPAGE_URL "https://github.com/wangwenx190/framelesshelper/" HOMEPAGE_URL "https://github.com/wangwenx190/framelesshelper/"
LANGUAGES CXX LANGUAGES CXX

4
qmake/inc/core/framelesshelper.version
View File

@ -35,9 +35,9 @@
[[maybe_unused]] inline constexpr const int FRAMELESSHELPER_VERSION_MAJOR = 2; [[maybe_unused]] inline constexpr const int FRAMELESSHELPER_VERSION_MAJOR = 2;
[[maybe_unused]] inline constexpr const int FRAMELESSHELPER_VERSION_MINOR = 3; [[maybe_unused]] inline constexpr const int FRAMELESSHELPER_VERSION_MINOR = 3;
[[maybe_unused]] inline constexpr const int FRAMELESSHELPER_VERSION_PATCH = 4; [[maybe_unused]] inline constexpr const int FRAMELESSHELPER_VERSION_PATCH = 5;
[[maybe_unused]] inline constexpr const int FRAMELESSHELPER_VERSION_TWEAK = 0; [[maybe_unused]] inline constexpr const int FRAMELESSHELPER_VERSION_TWEAK = 0;
[[maybe_unused]] inline constexpr const char FRAMELESSHELPER_VERSION_STR[] = "2.3.4.0\0"; [[maybe_unused]] inline constexpr const char FRAMELESSHELPER_VERSION_STR[] = "2.3.5.0\0";
[[maybe_unused]] inline constexpr const char FRAMELESSHELPER_COMMIT_STR[] = "UNKNOWN\0"; [[maybe_unused]] inline constexpr const char FRAMELESSHELPER_COMMIT_STR[] = "UNKNOWN\0";
[[maybe_unused]] inline constexpr const char FRAMELESSHELPER_COMPILE_DATETIME_STR[] = "UNKNOWN\0"; [[maybe_unused]] inline constexpr const char FRAMELESSHELPER_COMPILE_DATETIME_STR[] = "UNKNOWN\0";

11
src/core/framelesshelper_win.cpp
View File

@ -1138,14 +1138,12 @@ bool FramelessHelperWin::nativeEventFilter(const QByteArray &eventType, void *me
return true; // Jump over Qt's wrong handling logic. return true; // Jump over Qt's wrong handling logic.
} }
const QSizeF oldSize = {qreal(clientRect.right - clientRect.left), qreal(clientRect.bottom - clientRect.top)}; const QSizeF oldSize = {qreal(clientRect.right - clientRect.left), qreal(clientRect.bottom - clientRect.top)};
const UINT oldDpi = data.dpi.x;
static constexpr const auto defaultDpi = qreal(USER_DEFAULT_SCREEN_DPI); static constexpr const auto defaultDpi = qreal(USER_DEFAULT_SCREEN_DPI);
// We need to round the scale factor according to Qt's rounding policy. // We need to round the scale factor according to Qt's rounding policy.
const qreal oldDpr = Utils::roundScaleFactor(qreal(oldDpi) / defaultDpi); const qreal oldDpr = Utils::roundScaleFactor(qreal(data.dpi.x) / defaultDpi);
const QSizeF unscaledSize = (oldSize / oldDpr);
const auto newDpi = UINT(wParam); const auto newDpi = UINT(wParam);
const qreal newDpr = Utils::roundScaleFactor(qreal(newDpi) / defaultDpi); const qreal newDpr = Utils::roundScaleFactor(qreal(newDpi) / defaultDpi);
const QSizeF newSize = (unscaledSize * newDpr); const QSizeF newSize = (oldSize / oldDpr * newDpr);
const auto suggestedSize = reinterpret_cast<LPSIZE>(lParam); const auto suggestedSize = reinterpret_cast<LPSIZE>(lParam);
suggestedSize->cx = qRound(newSize.width()); suggestedSize->cx = qRound(newSize.width());
suggestedSize->cy = qRound(newSize.height()); suggestedSize->cy = qRound(newSize.height());
@ -1157,8 +1155,9 @@ bool FramelessHelperWin::nativeEventFilter(const QByteArray &eventType, void *me
if (frameBorderVisible) { if (frameBorderVisible) {
const int frameSizeX = Utils::getResizeBorderThicknessForDpi(true, newDpi); const int frameSizeX = Utils::getResizeBorderThicknessForDpi(true, newDpi);
const int frameSizeY = Utils::getResizeBorderThicknessForDpi(false, newDpi); const int frameSizeY = Utils::getResizeBorderThicknessForDpi(false, newDpi);
suggestedSize->cx += (frameSizeX * 2); suggestedSize->cx += (frameSizeX * 2); // The size of the two resize borders on the left and right edge.
suggestedSize->cy += frameSizeY; suggestedSize->cy += frameSizeY; // Only add the bottom resize border. We don't have anything on the top edge.
// Both the top resize border and the title bar are in the client area.
} }
*result = TRUE; // We have set our preferred window size, don't use the default linear DPI scaling. *result = TRUE; // We have set our preferred window size, don't use the default linear DPI scaling.
return true; // Jump over Qt's wrong handling logic. return true; // Jump over Qt's wrong handling logic.

2
src/core/micamaterial.cpp
View File

@ -72,7 +72,9 @@ static constexpr const qreal kDefaultBlurRadius = 128.0;
static Q_CONSTEXPR2 const QColor kDefaultSystemLightColor2 = {243, 243, 243}; // #F3F3F3 static Q_CONSTEXPR2 const QColor kDefaultSystemLightColor2 = {243, 243, 243}; // #F3F3F3
#ifndef FRAMELESSHELPER_CORE_NO_BUNDLE_RESOURCE
FRAMELESSHELPER_STRING_CONSTANT2(NoiseImageFilePath, ":/org.wangwenx190.FramelessHelper/resources/images/noise.png") FRAMELESSHELPER_STRING_CONSTANT2(NoiseImageFilePath, ":/org.wangwenx190.FramelessHelper/resources/images/noise.png")
#endif // FRAMELESSHELPER_CORE_NO_BUNDLE_RESOURCE
struct MicaMaterialData struct MicaMaterialData
{ {