From 5d391535ac7277102351fe2490c8c25b02375664 Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周一, 11 12月 2023 20:47:42 +0800
Subject: [PATCH] fix some mistakes
---
src/core/contexts/abstractwindowcontext.cpp | 25 +++++++++----------------
src/widgets/widgetwindowagent.cpp | 5 +++++
src/core/qwkglobal_p.h | 2 +-
3 files changed, 15 insertions(+), 17 deletions(-)
diff --git a/src/core/contexts/abstractwindowcontext.cpp b/src/core/contexts/abstractwindowcontext.cpp
index 3eb107a..18ed37f 100644
--- a/src/core/contexts/abstractwindowcontext.cpp
+++ b/src/core/contexts/abstractwindowcontext.cpp
@@ -172,18 +172,18 @@
return {};
}
- static constexpr const struct {
- const quint32 lilac = MAKE_RGBA_COLOR(210, 233, 189, 226);
+ static constexpr struct {
+ const quint32 grass = MAKE_RGBA_COLOR(210, 233, 189, 226);
const quint32 pink = MAKE_RGBA_COLOR(177, 205, 190, 240);
const quint32 tile = MAKE_RGBA_COLOR(193, 195, 211, 203);
- const quint32 azure = MAKE_RGBA_COLOR(25, 90, 190, 255);
- } kSampleColorSet{};
+ const quint32 azure = MAKE_RGBA_COLOR(240, 240, 250, 255);
+ } kSampleColorSet;
void AbstractWindowContext::virtual_hook(int id, void *data) {
switch (id) {
case ShowSystemMenuHook: {
const auto &pos = *reinterpret_cast<const QPoint *>(data);
- // ...
+ std::ignore = pos;
return;
}
case NeedsDrawBordersHook: {
@@ -196,27 +196,20 @@
auto &painter = *reinterpret_cast<QPainter *>(args[0]);
auto &rect = *reinterpret_cast<const QRect *>(args[1]);
- QPen pen{};
- pen.setWidth(1);
-
// Top
- pen.setColor(kSampleColorSet.lilac);
- painter.setPen(pen);
+ painter.setPen(kSampleColorSet.grass);
painter.drawLine(rect.topLeft(), rect.topRight());
// Right
- pen.setColor(kSampleColorSet.pink);
- painter.setPen(pen);
+ painter.setPen(kSampleColorSet.pink);
painter.drawLine(rect.topRight(), rect.bottomRight());
// Bottom
- pen.setColor(kSampleColorSet.tile);
- painter.setPen(pen);
+ painter.setPen(kSampleColorSet.tile);
painter.drawLine(rect.bottomLeft(), rect.bottomRight());
// Right
- pen.setColor(kSampleColorSet.azure);
- painter.setPen(pen);
+ painter.setPen(kSampleColorSet.azure);
painter.drawLine(rect.topLeft(), rect.bottomLeft());
return;
}
diff --git a/src/core/qwkglobal_p.h b/src/core/qwkglobal_p.h
index 5ad8a40..1c92541 100644
--- a/src/core/qwkglobal_p.h
+++ b/src/core/qwkglobal_p.h
@@ -15,7 +15,7 @@
# define QWK_FATAL qCFatal(qWindowKitLog)
#endif
-#define MAKE_RGB_COLOR(r, g, b) ((quint32) | (((r) &0xFF) << 16) | (((g) &0xFF) << 8) | ((b) &0xFF))
+#define MAKE_RGB_COLOR(r, g, b) ((quint32) (((r) &0xFF) << 16) | (((g) &0xFF) << 8) | ((b) &0xFF))
#define MAKE_RGBA_COLOR(r, g, b, a) \
((quint32) (((a) &0xFF) << 24) | (((r) &0xFF) << 16) | (((g) &0xFF) << 8) | ((b) &0xFF))
diff --git a/src/widgets/widgetwindowagent.cpp b/src/widgets/widgetwindowagent.cpp
index bde4f98..43528b5 100644
--- a/src/widgets/widgetwindowagent.cpp
+++ b/src/widgets/widgetwindowagent.cpp
@@ -81,6 +81,11 @@
needPaintBorder) {
d->paintFilter = std::make_unique<WidgetPaintFilter>(w, d->context.get());
}
+
+ if (d->context->key() == "win32") {
+ w->setContentsMargins(0, 1, 0, 0);
+ }
+
return true;
}
--
Gitblit v1.9.1