From 41243f8c5a66ae8f57c82f6a4f8b5bec6f55a571 Mon Sep 17 00:00:00 2001 From: zhangjiarui Date: Wed, 22 Jul 2026 21:00:43 +0800 Subject: [PATCH 1/2] fix(print): render page with white background --- src/frame/toptoolbar.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/frame/toptoolbar.cpp b/src/frame/toptoolbar.cpp index 052313287..2c627fb79 100644 --- a/src/frame/toptoolbar.cpp +++ b/src/frame/toptoolbar.cpp @@ -202,8 +202,8 @@ void TopTilte::initMenu() CPrintManager manager(drawApp->topMainWindowWidget()); auto page = drawApp->drawBoard()->currentPage(); if (page != nullptr && page->context() != nullptr) - manager.showPrintDialog(page->context()->renderToImage(), drawApp->topMainWindowWidget(), - page->name()); + manager.showPrintDialog(page->context()->renderToImage(Qt::white), drawApp->topMainWindowWidget(), + page->name()); }); } else { QAction *exportAc = new QAction(tr("Export"), this); From 96f6c7fbd7d3b18677a09ddd372da059e351dc66 Mon Sep 17 00:00:00 2001 From: zhangjiarui Date: Thu, 23 Jul 2026 14:28:35 +0800 Subject: [PATCH 2/2] fix(attributes): use palette text color MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use the current palette WindowText color for color property labels so they match adjacent DTK controls. Log: 修复工具属性文字颜色与圆角控件不一致的问题 Bug: https://pms.uniontech.com/bug-view-231619.html --- src/frame/AttributesWidgets/private/cattributeitemwidget.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/frame/AttributesWidgets/private/cattributeitemwidget.cpp b/src/frame/AttributesWidgets/private/cattributeitemwidget.cpp index 91ac47b4b..6b2de977a 100644 --- a/src/frame/AttributesWidgets/private/cattributeitemwidget.cpp +++ b/src/frame/AttributesWidgets/private/cattributeitemwidget.cpp @@ -197,7 +197,7 @@ void DrawAttribution::CColorSettingButton::paintFillArea(QPainter *painter) //绘制常量文字("填充") painter->save(); - painter->setPen(darkTheme ? QColor("#C0C6D4") : QColor("#414D68")); + painter->setPen(palette().color(QPalette::WindowText)); painter->drawText(textRct, _text, QTextOption(Qt::AlignLeft | Qt::AlignVCenter)); painter->restore(); } @@ -258,7 +258,7 @@ void DrawAttribution::CColorSettingButton::paintFillBorder(QPainter *painter) //绘制常量文字("描边") painter->save(); - painter->setPen(darkTheme ? QColor("#C0C6D4") : QColor("#414D68")); + painter->setPen(palette().color(QPalette::WindowText)); painter->drawText(textRct, _text, QTextOption(Qt::AlignLeft | Qt::AlignVCenter)); painter->restore(); }