Skip to content

fix(viewing): replace font metrics with document renderer #422

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
deepin-bot merged 1 commit into from
Jan 30, 2026
Merged

fix(viewing): replace font metrics with document renderer #422

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions dde-license-dialog/src/content.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,12 @@
#include <QDebug>
#include <QFontMetrics>
#include <QScroller>
#include <QtConcurrent>

Check warning on line 21 in dde-license-dialog/src/content.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

Include file: <QtConcurrent> not found. Please note: Cppcheck does not need standard library headers to get proper results.
#include <QThread>

Check warning on line 22 in dde-license-dialog/src/content.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

Include file: <QThread> not found. Please note: Cppcheck does not need standard library headers to get proper results.
#include <QTranslator>

Check warning on line 23 in dde-license-dialog/src/content.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

Include file: <QTranslator> not found. Please note: Cppcheck does not need standard library headers to get proper results.
#include <QTextDocument>

Check warning on line 24 in dde-license-dialog/src/content.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

Include file: <QTextDocument> not found. Please note: Cppcheck does not need standard library headers to get proper results.

#include <unistd.h>

Check warning on line 26 in dde-license-dialog/src/content.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

Include file: <unistd.h> not found. Please note: Cppcheck does not need standard library headers to get proper results.

DWIDGET_USE_NAMESPACE

Expand Down Expand Up @@ -278,10 +279,11 @@
// 根据文本多少，调整窗口大小
void Content::updateWindowHeight()
{
QRect rc = m_source->rect();
rc.setWidth(rc.width() - 40);
QSize sz = m_source->fontMetrics().boundingRect(rc, Qt::TextWordWrap, m_source->text()).size();

int minHeight = qBound(300, sz.height(), 491);
QTextDocument doc;
doc.setHtml(m_source->text());
doc.setTextWidth(m_scrollArea->width() - 40);

int contentHeight = static_cast<int>(doc.size().height());
int minHeight = qBound(100, contentHeight, 491);
m_scrollArea->setMinimumHeight(minHeight);
}