Skip to content

Commit fbb8d9d

Browse files
committed
fix: update copyright year and add fillMode property
Updated the copyright year from 2022 to 2026 in the SPDX headers of DQuickDciIconImage source files. Added a new `fillMode` property to the DQuickDciIconImage class to expose the underlying QQuickIconImage's fillMode functionality. This includes adding the Q_PROPERTY declaration, getter/setter methods, signal connection, and the corresponding signal. The change ensures that the DCI icon image component can properly control how the icon image is scaled and positioned within its bounds, matching the capabilities of standard QML Image items. fix: 更新版权年份并添加 fillMode 属性 将 DQuickDciIconImage 源文件 SPDX 头中的版权年份从 2022 更新至 2026。为 DQuickDciIconImage 类新增了 `fillMode` 属性,以暴露底层 QQuickIconImage 的填充模式功能。这包括添加 Q_PROPERTY 声明、getter/setter 方法、信号连接 以及对应的信号。此项更改确保 DCI 图标图像组件能够正确控制图标图像在其边 界内的缩放和定位方式,与标准 QML Image 项的功能保持一致。 PMS: BUG-301329
1 parent 6307600 commit fbb8d9d

2 files changed

Lines changed: 20 additions & 2 deletions

File tree

src/private/dquickdciiconimage.cpp

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// SPDX-FileCopyrightText: 2021 - 2022 UnionTech Software Technology Co., Ltd.
1+
// SPDX-FileCopyrightText: 2021 - 2026 UnionTech Software Technology Co., Ltd.
22
//
33
// SPDX-License-Identifier: LGPL-3.0-or-later
44

@@ -181,6 +181,7 @@ DQuickDciIconImagePrivate::DQuickDciIconImagePrivate(DQuickDciIconImage *qq)
181181
QObject::connect(imageItem, &DQuickIconImage::nameChanged, qq, &DQuickDciIconImage::nameChanged);
182182
QObject::connect(imageItem, &DQuickIconImage::asynchronousChanged, qq, &DQuickDciIconImage::asynchronousChanged);
183183
QObject::connect(imageItem, &DQuickIconImage::cacheChanged, qq, &DQuickDciIconImage::cacheChanged);
184+
QObject::connect(imageItem, &DQuickIconImage::fillModeChanged, qq, &DQuickDciIconImage::fillModeChanged);
184185
#if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
185186
QObject::connect(imageItem, &DQuickIconImage::retainWhileLoadingChanged, qq, &DQuickDciIconImage::retainWhileLoadingChanged);
186187
#endif
@@ -355,6 +356,18 @@ void DQuickDciIconImage::setRetainWhileLoading(bool retain)
355356
}
356357
#endif
357358

359+
void DQuickDciIconImage::setFillMode(QQuickImage::FillMode mode)
360+
{
361+
D_D(DQuickDciIconImage);
362+
d->imageItem->setFillMode(mode);
363+
}
364+
365+
QQuickImage::FillMode DQuickDciIconImage::fillMode() const
366+
{
367+
D_DC(DQuickDciIconImage);
368+
return d->imageItem->fillMode();
369+
}
370+
358371
bool DQuickDciIconImage::cache() const
359372
{
360373
D_DC(DQuickDciIconImage);

src/private/dquickdciiconimage_p.h

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// SPDX-FileCopyrightText: 2021 - 2022 UnionTech Software Technology Co., Ltd.
1+
// SPDX-FileCopyrightText: 2021 - 2026 UnionTech Software Technology Co., Ltd.
22
//
33
// SPDX-License-Identifier: LGPL-3.0-or-later
44

@@ -35,6 +35,7 @@ class DQuickDciIconImage : public QQuickItem, DCORE_NAMESPACE::DObject
3535
#if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
3636
Q_PROPERTY(bool retainWhileLoading READ retainWhileLoading WRITE setRetainWhileLoading NOTIFY retainWhileLoadingChanged)
3737
#endif
38+
Q_PROPERTY(QQuickImage::FillMode fillMode READ fillMode WRITE setFillMode NOTIFY fillModeChanged)
3839
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
3940
QML_NAMED_ELEMENT(DciIcon)
4041
QML_ATTACHED(DQuickIconAttached)
@@ -77,6 +78,9 @@ class DQuickDciIconImage : public QQuickItem, DCORE_NAMESPACE::DObject
7778
void setRetainWhileLoading(bool retain);
7879
#endif
7980

81+
void setFillMode(QQuickImage::FillMode mode);
82+
QQuickImage::FillMode fillMode() const;
83+
8084
DQuickIconImage *imageItem() const;
8185

8286
static bool isNull(const QString &iconName);
@@ -92,6 +96,7 @@ class DQuickDciIconImage : public QQuickItem, DCORE_NAMESPACE::DObject
9296
void fallbackToQIconChanged();
9397
void asynchronousChanged();
9498
void cacheChanged();
99+
void fillModeChanged();
95100

96101
#if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
97102
void retainWhileLoadingChanged();

0 commit comments

Comments
 (0)