Skip to content

Commit baa4178

Browse files
deepin-ci-robot18202781743
authored andcommitted
sync: from linuxdeepin/dtkwidget
Synchronize source files from linuxdeepin/dtkwidget. Source-pull-request: linuxdeepin/dtkwidget#707
1 parent 657ae92 commit baa4178

File tree

1 file changed

+10
-0
lines changed

1 file changed

+10
-0
lines changed

src/widgets/dstyle.cpp

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
#include <QGuiApplication>
2222
#include <QAbstractItemView>
2323
#include <QPainterPath>
24+
#include <QLoggingCategory>
2425

2526
#include <qmath.h>
2627
#include <private/qfixed_p.h>
@@ -38,6 +39,7 @@ DCORE_USE_NAMESPACE
3839
DGUI_USE_NAMESPACE
3940
DWIDGET_BEGIN_NAMESPACE
4041

42+
Q_LOGGING_CATEGORY(dStyle, "dtk.widget.style")
4143

4244
/*!
4345
\brief 该函数用于调整给定颜色.
@@ -173,7 +175,13 @@ void DStyle::setRedPointVisible(QObject *object, bool visible)
173175

174176
void DStyle::setLineEditIconMargin(QObject *object, int margin)
175177
{
178+
#if (QT_VERSION >= QT_VERSION_CHECK(6, 3, 0))
176179
object->setProperty("_d_dtk_lineeditIconMargin", margin);
180+
#else
181+
Q_UNUSED(object)
182+
Q_UNUSED(margin)
183+
qWarning(dStyle) << "DStyle::setLineEditIconMargin is only available since Qt 6.3 or in uos.";
184+
#endif
177185
}
178186

179187
void DStyle::setShortcutUnderlineVisible(bool visible)
@@ -2264,6 +2272,7 @@ int DStyle::pixelMetric(QStyle::PixelMetric m, const QStyleOption *opt, const QW
22642272
return 16;
22652273
case PM_MenuButtonIndicator:
22662274
return DSizeModeHelper::element(8, QCommonStyle::pixelMetric(m, opt, widget));
2275+
#if (QT_VERSION >= QT_VERSION_CHECK(6, 3, 0))
22672276
// since Qt 6.3 or applied patch Add-setting-thc-ICON-size-attribute-in-lineedit-to-the-style-plugin.patch( uos or deepin).
22682277
case PM_LineEditIconMargin: {
22692278
if (widget) {
@@ -2278,6 +2287,7 @@ int DStyle::pixelMetric(QStyle::PixelMetric m, const QStyleOption *opt, const QW
22782287
}
22792288
Q_FALLTHROUGH();
22802289
}
2290+
#endif
22812291
case PM_FloatingButtonFrameMargin:
22822292
return 3;
22832293
default:

0 commit comments

Comments
 (0)