From bc8380ff0d169dc244ca6a99d33c4c833068335f Mon Sep 17 00:00:00 2001 From: lijiaxuan Date: Wed, 10 Jan 2024 16:23:22 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BA=86=E7=9C=8B?= =?UTF-8?q?=E5=9B=BE=E7=95=A5=E7=BC=A9=E5=9B=BE=E6=98=BE=E7=A4=BA=E4=BC=9A?= =?UTF-8?q?=E6=8B=89=E4=BC=B8=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 看图略缩图预览显示调整, paint()中绘制缩略图 仅显示中间部分图像,其他部分裁剪. Log: 修复了预览略缩图拉伸bug Bug: https://pms.uniontech.com/bug-view-158423.html --- libimageviewer/viewpanel/contents/imgviewdelegate.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libimageviewer/viewpanel/contents/imgviewdelegate.cpp b/libimageviewer/viewpanel/contents/imgviewdelegate.cpp index 51a6c322..443e7474 100644 --- a/libimageviewer/viewpanel/contents/imgviewdelegate.cpp +++ b/libimageviewer/viewpanel/contents/imgviewdelegate.cpp @@ -161,10 +161,14 @@ void LibImgViewDelegate::paint(QPainter *painter, const QStyleOptionViewItem &op painter->setClipPath(bg); } + //对略缩图的拉伸做了截取，使显示为未拉伸的图片 QPainterPath bp1; bp1.addRoundedRect(pixmapRect, 4, 4); painter->setClipPath(bp1); - painter->drawImage(pixmapRect, _pixmap); + _pixmap = _pixmap.scaled(pixmapRect.size(), Qt::KeepAspectRatioByExpanding, Qt::SmoothTransformation); + qreal adjustx = _pixmap.width() - pixmapRect.width(); + qreal adjusty = _pixmap.height() - pixmapRect.height(); + painter->drawImage(pixmapRect,_pixmap,_pixmap.rect().adjusted(adjustx/2, -adjusty/2, -adjustx/2, adjusty/2)); painter->restore(); } From 6ae2ef273818545a074f3a0325e456a49b18268e Mon Sep 17 00:00:00 2001 From: renbin Date: Fri, 12 Jan 2024 17:59:17 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E4=BA=86=E9=87=8D?= =?UTF-8?q?=E5=91=BD=E5=90=8D=E7=AA=97=E5=8F=A3=E7=9A=84=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=90=8D=E5=90=8E=E7=BC=80=E9=A2=9C=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修改了重命名窗口的文件名后缀颜色，添加了其主题变更的颜色变化 Log: 修复了深色模式下重命名弹窗文字看不清的问题 Bug: https://pms.uniontech.com/bug-view-231485.html --- .../viewpanel/contents/imgviewdelegate.cpp | 2 +- libimageviewer/widgets/renamedialog.cpp | 84 ++++++++----------- libimageviewer/widgets/renamedialog.h | 2 + 3 files changed, 39 insertions(+), 49 deletions(-) diff --git a/libimageviewer/viewpanel/contents/imgviewdelegate.cpp b/libimageviewer/viewpanel/contents/imgviewdelegate.cpp index 443e7474..daa4be70 100644 --- a/libimageviewer/viewpanel/contents/imgviewdelegate.cpp +++ b/libimageviewer/viewpanel/contents/imgviewdelegate.cpp @@ -168,7 +168,7 @@ void LibImgViewDelegate::paint(QPainter *painter, const QStyleOptionViewItem &op _pixmap = _pixmap.scaled(pixmapRect.size(), Qt::KeepAspectRatioByExpanding, Qt::SmoothTransformation); qreal adjustx = _pixmap.width() - pixmapRect.width(); qreal adjusty = _pixmap.height() - pixmapRect.height(); - painter->drawImage(pixmapRect,_pixmap,_pixmap.rect().adjusted(adjustx/2, -adjusty/2, -adjustx/2, adjusty/2)); + painter->drawImage(pixmapRect,_pixmap,_pixmap.rect().adjusted(adjustx / 2, -adjusty / 2, -adjustx / 2, adjusty / 2)); painter->restore(); } diff --git a/libimageviewer/widgets/renamedialog.cpp b/libimageviewer/widgets/renamedialog.cpp index 7ff26cb2..0dead2f0 100644 --- a/libimageviewer/widgets/renamedialog.cpp +++ b/libimageviewer/widgets/renamedialog.cpp @@ -7,7 +7,7 @@ #include "unionimage/imageutils.h" #include "accessibility/ac-desktop-define.h" - +#include #include #include #include @@ -26,8 +26,8 @@ RenameDialog::RenameDialog(const QString &filename, QWidget *parent) { this->setIcon(QIcon::fromTheme("deepin-image-viewer")); DWidget *widet = new DWidget(this); - this->setContentsMargins(0,0,0,0); - layout()->setSpacing(0); // 标题栏和内容部件间隙设为0，在视觉上缩短标题栏间隙 + this->setContentsMargins(0, 0, 0, 0); + layout()->setSpacing(0); // 标题栏和内容部件间隙设为0，在视觉上缩短标题栏间隙 addContent(widet); m_vlayout = new QVBoxLayout(widet); m_labvlayout = new QVBoxLayout(); @@ -38,7 +38,7 @@ RenameDialog::RenameDialog(const QString &filename, QWidget *parent) m_lineedt = new DLineEdit(widet); QFrame *line = new QFrame(widet); line->setLineWidth(2); - line->setFixedHeight(25);// 垂直分割线短于按钮高度 + line->setFixedHeight(25); // 垂直分割线短于按钮高度 QLbtoDLabel *labtitle = new QLbtoDLabel(); okbtn = new DSuggestButton(tr("Confirm"), widet); cancelbtn = new DPushButton(tr("Cancel"), widet); @@ -46,26 +46,21 @@ RenameDialog::RenameDialog(const QString &filename, QWidget *parent) cancelbtn->setFixedHeight(35); m_labformat = new DLabel(widet); m_vlayout->setContentsMargins(2, 0, 2, 1); -// okbtn->setText(); -// cancelbtn->setText(); + m_hlayout->addWidget(cancelbtn); line->setFrameShape(QFrame::VLine); - line->setFrameShadow(QFrame::Plain); // 垂直分割线颜色应为浅灰 + line->setFrameShadow(QFrame::Plain); // 垂直分割线颜色应为浅灰 m_hlayout->addWidget(line); m_hlayout->addWidget(okbtn); - m_hlayout->setSpacing(7);// 保证按钮间距20px + m_hlayout->setSpacing(7); // 保证按钮间距20px labtitle->setText(tr("Input a new name")); - labtitle->setFixedHeight(40); //增加标签区域显示高度，在视觉上缩短标题栏间隙 + labtitle->setFixedHeight(40); //增加标签区域显示高度，在视觉上缩短标题栏间隙 labtitle->setAlignment(Qt::AlignCenter); m_labvlayout->addWidget(labtitle); -// m_vlayout->addWidget(labtitle); -// m_vlayout->addStretch(); m_edtlayout->addWidget(m_lineedt); m_lineedt->setFixedHeight(35); -// connect(m_lineedt, &DLineEdit::focusChanged, this, &RenameDialog::slotsFocusChanged); - m_labformat->setEnabled(false); m_edtlayout->addWidget(m_labformat); m_labformat->setFixedHeight(35); @@ -73,39 +68,32 @@ RenameDialog::RenameDialog(const QString &filename, QWidget *parent) m_vlayout->addLayout(m_labvlayout); m_vlayout->addStretch(); - m_vlayout->addLayout(m_hlayout); -// m_vlayout->setStretch(0, 5); -// m_vlayout->setStretch(1, 1); -// m_vlayout->setStretch(2, 1); -// m_vlayout->setStretch(3, 1); widet->setLayout(m_vlayout); -// onThemeChanged(dApp->viewerTheme->getCurrentTheme()); + onThemeChanged(DGuiApplicationHelper::instance()->themeType()); InitDlg(); m_lineedt->lineEdit()->setFocus(); int Dirlen = /*m_DirPath.size() +*/ 1 + m_labformat->text().size(); - //正则表达式排除文管不支持的字符 - QRegExp rx("^[^\\.\\\\/\':\\*\\?\"<>|%&][^\\\\/\':\\*\\?\"<>|%&]*"); //屏蔽特殊字符 -// QRegExp rx("[^\\\\//:*?\"<>|]*"); + // 正则表达式排除文管不支持的字符 + // 屏蔽特殊字符 QRegExp rx("[^\\\\//:*?\"<>|]*"); + QRegExp rx("^[^\\.\\\\/\':\\*\\?\"<>|%&][^\\\\/\':\\*\\?\"<>|%&]*"); + QRegExpValidator *pReg = new QRegExpValidator(rx, this); m_lineedt->lineEdit()->setValidator(pReg); - connect(okbtn, &DSuggestButton::clicked, this, [ = ] { + connect(okbtn, &DSuggestButton::clicked, this, [=] { m_filename = m_lineedt->text() + m_labformat->text(); m_filenamepath = m_DirPath + "/" + m_filename; accept(); }); - connect(cancelbtn, &DPushButton::clicked, this, [ = ] { - reject(); - }); - - connect(m_lineedt, &DLineEdit::textChanged, this, [ = ](const QString & arg) { + connect(cancelbtn, &DPushButton::clicked, this, [=] { reject(); }); + connect(m_lineedt, &DLineEdit::textChanged, this, [=](const QString &arg) { setCurrentTip(); int len = arg.toLocal8Bit().length(); //修复字符串长度超长会将 - if (len > 256 - Dirlen) return; - + if (len > 256 - Dirlen) + return; }); - connect(m_lineedt, &DLineEdit::textEdited, this, [ = ](const QString & arg) { + connect(m_lineedt, &DLineEdit::textEdited, this, [=](const QString &arg) { if (arg.isEmpty()) { return; } @@ -124,7 +112,8 @@ RenameDialog::RenameDialog(const QString &filename, QWidget *parent) for (; i < arg.size(); i++) { if (arg.at(i) >= 0x4e00 && arg.at(i) <= 0x9fa5) { num += 3; - if (num >= 256 - Dirlen - 1) break; + if (num >= 256 - Dirlen - 1) + break; } else if (num < 256 - Dirlen) { num += 1; } else { @@ -150,19 +139,6 @@ RenameDialog::RenameDialog(const QString &filename, QWidget *parent) setFixedSize(380, 190); } - -//void RenameDialog::onThemeChanged(ViewerThemeManager::AppTheme theme) -//{ -// QPalette pe; -// if (theme == ViewerThemeManager::Dark) { -// pe.setColor(QPalette::WindowText, Qt::darkGray); -// } else { -// pe.setColor(QPalette::WindowText, Qt::lightGray); -// } -// m_labformat->setPalette(pe); -//} - - QString RenameDialog::GetFilePath() { return m_filenamepath; @@ -180,7 +156,7 @@ void RenameDialog::InitDlg() m_filename = fileinfo.fileName(); QString format = fileinfo.suffix(); QString basename; - //basename会过滤掉.,那么1.....png就会出现basename为1,completeBaseName不会,修改bug66356 + // basename会过滤掉.,那么1.....png就会出现basename为1,completeBaseName不会,修改bug66356 m_basename = fileinfo.completeBaseName(); m_lineedt->setText(m_basename); m_labformat->setText("." + format); @@ -204,7 +180,6 @@ void RenameDialog::setCurrentTip() okbtn->setEnabled(true); m_lineedt->hideAlertMessage(); } - } void RenameDialog::paintEvent(QPaintEvent *event) @@ -212,7 +187,6 @@ void RenameDialog::paintEvent(QPaintEvent *event) QWidget::paintEvent(event); } - QString RenameDialog::geteElidedText(QFont font, QString str, int MaxWidth) { QFontMetrics fontWidth(font); @@ -230,6 +204,20 @@ void RenameDialog::slotsFocusChanged(bool onFocus) } } +void RenameDialog::onThemeChanged(DGuiApplicationHelper::ColorType theme) +{ + // 文件后缀颜色跟随主题变化 + QPalette palette = m_labformat->palette(); + if (theme == DGuiApplicationHelper::ColorType::DarkType) { + const QColor prefixColor = QColor(179, 179, 179); + palette.setColor(QPalette::WindowText, prefixColor); + } else { + const QColor prefixColor = QColor(77, 77, 77); + palette.setColor(QPalette::WindowText, prefixColor); + } + m_labformat->setPalette(palette); +} + void RenameDialog::slotsUpdate() { setCurrentTip(); diff --git a/libimageviewer/widgets/renamedialog.h b/libimageviewer/widgets/renamedialog.h index 48cd79a2..ad71d4d4 100644 --- a/libimageviewer/widgets/renamedialog.h +++ b/libimageviewer/widgets/renamedialog.h @@ -13,6 +13,7 @@ #include #include #include +#include DWIDGET_USE_NAMESPACE class RenameDialog : public DDialog @@ -32,6 +33,7 @@ class RenameDialog : public DDialog QString geteElidedText(QFont font, QString str, int MaxWidth); private slots: void slotsFocusChanged(bool onFocus); + void onThemeChanged(DGuiApplicationHelper::ColorType theme); public: void slotsUpdate(); protected: