From a06b4b82b8efcde55eafbe5b38c05fe220892d96 Mon Sep 17 00:00:00 2001
From: Yuhang Zhao <2546789017@qq.com>
Date: Mon, 14 Mar 2022 17:33:05 +0800
Subject: [PATCH] wip

Signed-off-by: Yuhang Zhao <2546789017@qq.com>
---
 framelesshelper_win32.cpp |   2 +-
 utilities_linux.cpp       | 104 --------------------------------------
 2 files changed, 1 insertion(+), 105 deletions(-)

diff --git a/framelesshelper_win32.cpp b/framelesshelper_win32.cpp
index e6f1082..ab4448d 100644
--- a/framelesshelper_win32.cpp
+++ b/framelesshelper_win32.cpp
@@ -75,7 +75,7 @@ Q_GLOBAL_STATIC(FramelessHelperWinData, g_helper)
         const int frameSizeX = Utilities::getResizeBorderThickness(winId, true, true);
         const int frameSizeY = Utilities::getResizeBorderThickness(winId, false, true);
         const int titleBarHeight = Utilities::getTitleBarHeight(winId, true);
-        const int horizontalOffset = (maxOrFull ? 0 : frameSizeX);
+        const int horizontalOffset = ((maxOrFull || !Utilities::isWin10OrGreater()) ? 0 : frameSizeX);
         const int verticalOffset = (maxOrFull ? titleBarHeight : (titleBarHeight - frameSizeY));
         return {qreal(rect.left + horizontalOffset), qreal(rect.top + verticalOffset)};
     };
diff --git a/utilities_linux.cpp b/utilities_linux.cpp
index 6c39c24..e6060a1 100644
--- a/utilities_linux.cpp
+++ b/utilities_linux.cpp
@@ -24,112 +24,8 @@
 
 #include "utilities.h"
 
-#include <QtCore/qvariant.h>
-
 FRAMELESSHELPER_BEGIN_NAMESPACE
 
-static constexpr const int kDefaultResizeBorderThickness = 8;
-static constexpr const int kDefaultCaptionHeight = 23;
 
-int Utilities::getSystemMetric(const QWindow *window, const SystemMetric metric, const bool dpiScale, const bool forceSystemValue)
-{
-    Q_ASSERT(window);
-    if (!window) {
-        return 0;
-    }
-    const qreal devicePixelRatio = window->devicePixelRatio();
-    const qreal scaleFactor = (dpiScale ? devicePixelRatio : 1.0);
-    switch (metric) {
-    case SystemMetric::ResizeBorderThickness: {
-        const int resizeBorderThickness = window->property(Constants::kResizeBorderThicknessFlag).toInt();
-        if ((resizeBorderThickness > 0) && !forceSystemValue) {
-            return qRound(static_cast<qreal>(resizeBorderThickness) * scaleFactor);
-        } else {
-            // ### TO BE IMPLEMENTED: Retrieve system value through official API
-            if (dpiScale) {
-                return qRound(static_cast<qreal>(kDefaultResizeBorderThickness) * devicePixelRatio);
-            } else {
-                return kDefaultResizeBorderThickness;
-            }
-        }
-    }
-    case SystemMetric::CaptionHeight: {
-        const int captionHeight = window->property(Constants::kCaptionHeightFlag).toInt();
-        if ((captionHeight > 0) && !forceSystemValue) {
-            return qRound(static_cast<qreal>(captionHeight) * scaleFactor);
-        } else {
-            // ### TO BE IMPLEMENTED: Retrieve system value through official API
-            if (dpiScale) {
-                return qRound(static_cast<qreal>(kDefaultCaptionHeight) * devicePixelRatio);
-            } else {
-                return kDefaultCaptionHeight;
-            }
-        }
-    }
-    case SystemMetric::TitleBarHeight: {
-        const int titleBarHeight = window->property(Constants::kTitleBarHeightFlag).toInt();
-        if ((titleBarHeight > 0) && !forceSystemValue) {
-            return qRound(static_cast<qreal>(titleBarHeight) * scaleFactor);
-        } else {
-            const int captionHeight = getSystemMetric(window,SystemMetric::CaptionHeight,
-                                                      dpiScale, forceSystemValue);
-            const int resizeBorderThickness = getSystemMetric(window, SystemMetric::ResizeBorderThickness,
-                                                              dpiScale, forceSystemValue);
-            return (((window->windowState() == Qt::WindowMaximized)
-                     || (window->windowState() == Qt::WindowFullScreen))
-                    ? captionHeight : (captionHeight + resizeBorderThickness));
-        }
-    }
-    }
-    return 0;
-}
-
-QColor Utilities::getColorizationColor()
-{
-    // ### TO BE IMPLEMENTED
-    return Qt::darkGray;
-}
-
-int Utilities::getWindowVisibleFrameBorderThickness(const WId winId)
-{
-    // ### TO BE IMPLEMENTED
-    Q_UNUSED(winId);
-    return 1;
-}
-
-bool Utilities::shouldAppsUseDarkMode()
-{
-    // ### TO BE IMPLEMENTED
-    return false;
-}
-
-ColorizationArea Utilities::getColorizationArea()
-{
-    // ### TO BE IMPLEMENTED
-    return ColorizationArea::None;
-}
-
-bool Utilities::isThemeChanged(const void *data)
-{
-    // ### TO BE IMPLEMENTED
-    Q_UNUSED(data);
-    return false;
-}
-
-bool Utilities::isSystemMenuRequested(const void *data, QPointF *pos)
-{
-    // ### TO BE IMPLEMENTED
-    Q_UNUSED(data);
-    Q_UNUSED(pos);
-    return false;
-}
-
-bool Utilities::showSystemMenu(const WId winId, const QPointF &pos)
-{
-    // ### TO BE IMPLEMENTED
-    Q_UNUSED(winId);
-    Q_UNUSED(pos);
-    return false;
-}
 
 FRAMELESSHELPER_END_NAMESPACE