Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 15 additions & 1 deletion panels/dock/taskmanager/package/AppItemTitle.qml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

import QtQuick
import QtQuick.Controls
import Qt5Compat.GraphicalEffects

import org.deepin.ds.dock.taskmanager 1.0
import org.deepin.dtk 1.0 as D
Expand All @@ -30,7 +31,20 @@ Item {
color: D.DTK.themeType === D.ApplicationHelper.DarkType ? "#FFFFFF" : "#000000"
font: root.TextCalculator.calculator.font
verticalAlignment: Text.AlignVCenter


layer.enabled: root.TextCalculator.ellipsisWidth > 0
layer.effect: OpacityMask {
maskSource: Rectangle {
id: maskRect
width: root.TextCalculator.ellipsisWidth
height: titleText.height
gradient: Gradient {
orientation: Gradient.Horizontal
GradientStop { position: 1; color: "#00FFFFFF" }
GradientStop { position: 0.6; color: "#FFFFFFFF" }
}
}
}
opacity: visible ? 1.0 : 0.0

Behavior on opacity {
Expand Down
50 changes: 35 additions & 15 deletions panels/dock/taskmanager/textcalculator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,6 @@ namespace dock
{
Q_LOGGING_CATEGORY(textCalculatorLog, "ds.taskmanager.textcalculator");

static bool isValidElidedText(const QString &text)
{
return !text.isEmpty() && text != "…";
}

TextCalculator::TextCalculator(QObject *parent)
: QObject(parent)
, m_optimalSingleTextWidth(0.0)
Expand Down Expand Up @@ -196,11 +191,19 @@ qreal TextCalculator::calculateElidedTextWidth(const QString &text, qreal maxWid
}

QFontMetricsF fontMetrics(m_font);
QString elidedText = fontMetrics.elidedText(text, Qt::ElideRight, maxWidth);
if (!isValidElidedText(elidedText))
QString visibleText = text;

while (!visibleText.isEmpty() &&
fontMetrics.horizontalAdvance(visibleText) > maxWidth)
{
visibleText.chop(1);
}

if (visibleText.isEmpty()) {
return 0.0;
}

return fontMetrics.horizontalAdvance(elidedText);
return fontMetrics.horizontalAdvance(visibleText);
}

QStringList TextCalculator::getApplicationTitles() const
Expand Down Expand Up @@ -258,8 +261,8 @@ void TextCalculator::calculateOptimalTextWidth()
qreal newTotalWidth = 0.0;
int charCount = 7; // Maximum character count limit

// Iterate from 7 characters to 1 character, finding the optimal solution
for (; charCount >= 1; --charCount) {
// Iterate from 7 characters to 2 characters, finding the optimal solution
for (; charCount >= 2; --charCount) {
// 1. Calculate baseline width (based on character count)
qreal baselineWidth = calculateBaselineWidth(charCount);

Expand Down Expand Up @@ -401,19 +404,36 @@ void TextCalculatorAttached::updateElidedText()
if (!m_calculator) {
qCDebug(textCalculatorLog) << "No calculator available for elided text update";
m_elidedText.clear();
m_ellipsisWidth = 0.0;
emit elidedTextChanged();
emit ellipsisWidthChanged();
return;
}

QFontMetricsF fontMetrics(m_calculator->font());
qreal maxWidth = m_calculator->optimalSingleTextWidth();
QString visibleText = m_text;

while (!visibleText.isEmpty() &&
fontMetrics.horizontalAdvance(visibleText) > maxWidth)
{
visibleText.chop(1);
}

QString newElidedText = fontMetrics.elidedText(m_text, Qt::ElideRight, maxWidth);
if (!isValidElidedText(newElidedText)) {
newElidedText = {};
if (visibleText.isEmpty()) {
visibleText = {};
}
if (m_elidedText != newElidedText) {
m_elidedText = newElidedText;

if (visibleText != m_text) {
m_ellipsisWidth = fontMetrics.horizontalAdvance(QString::fromUtf8("…"));
emit ellipsisWidthChanged();
} else {
m_ellipsisWidth = 0.0;
emit ellipsisWidthChanged();
}

if (m_elidedText != visibleText) {
m_elidedText = visibleText;
emit elidedTextChanged();
}
}
Expand Down
8 changes: 8 additions & 0 deletions panels/dock/taskmanager/textcalculator.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
QML_ELEMENT
Q_PROPERTY(QString text READ text WRITE setText NOTIFY textChanged)
Q_PROPERTY(QString elidedText READ elidedText NOTIFY elidedTextChanged)
Q_PROPERTY(qreal ellipsisWidth READ ellipsisWidth NOTIFY ellipsisWidthChanged)
Q_PROPERTY(TextCalculator *calculator READ calculator NOTIFY calculatorChanged)

public:
Expand All @@ -34,19 +35,26 @@

QString elidedText() const;

qreal ellipsisWidth() const
{
return m_ellipsisWidth;
}

void ensureInitialize();

Q_SIGNALS:
void textChanged();
void elidedTextChanged();
void ellipsisWidthChanged();
void calculatorChanged();

private Q_SLOTS:

Check warning on line 51 in panels/dock/taskmanager/textcalculator.h

View workflow job for this annotation

GitHub Actions / cppcheck

There is an unknown macro here somewhere. Configuration is required. If Q_SLOTS is a macro then please configure it.
void updateElidedText();

private:
QString m_text;
QString m_elidedText;
qreal m_ellipsisWidth = 0.0;
TextCalculator *m_calculator;
bool m_initialized = false;
};
Expand Down
Loading