aboutsummaryrefslogtreecommitdiff
path: root/src/plugins/Ui/qsui
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/Ui/qsui')
-rw-r--r--src/plugins/Ui/qsui/elidinglabel.cpp2
-rw-r--r--src/plugins/Ui/qsui/equalizer.cpp2
-rw-r--r--src/plugins/Ui/qsui/listwidgetdrawer.cpp48
-rw-r--r--src/plugins/Ui/qsui/playlistheader.cpp10
4 files changed, 31 insertions, 31 deletions
diff --git a/src/plugins/Ui/qsui/elidinglabel.cpp b/src/plugins/Ui/qsui/elidinglabel.cpp
index 7fda25390..71d13ce74 100644
--- a/src/plugins/Ui/qsui/elidinglabel.cpp
+++ b/src/plugins/Ui/qsui/elidinglabel.cpp
@@ -70,7 +70,7 @@ void ElidingLabel::paintEvent(QPaintEvent *)
QRect contents = contentsRect().adjusted(m, m, -m, -m);
QFontMetrics fm = fontMetrics();
QString txt = text();
- if (txt.length() > 4 && fm.width(txt) > contents.width()) {
+ if (txt.length() > 4 && fm.horizontalAdvance(txt) > contents.width()) {
setToolTip(txt);
txt = fm.elidedText(txt, m_elideMode, contents.width());
} else {
diff --git a/src/plugins/Ui/qsui/equalizer.cpp b/src/plugins/Ui/qsui/equalizer.cpp
index c494217af..1b58697f6 100644
--- a/src/plugins/Ui/qsui/equalizer.cpp
+++ b/src/plugins/Ui/qsui/equalizer.cpp
@@ -99,7 +99,7 @@ Equalizer::Equalizer(QWidget *parent) : QDialog(parent)
QLabel *label2 = new QLabel(this);
label2->setText(tr("%1dB").arg(0));
label2->setFrameShape(QFrame::Box);
- label2->setMinimumWidth(fontMetrics().width(tr("+%1dB").arg(20) + 5));
+ label2->setMinimumWidth(fontMetrics().horizontalAdvance(tr("+%1dB").arg(20) + 5));
label2->setAlignment(Qt::AlignCenter);
slidersLayout->addWidget(label2, 0, i, Qt::AlignHCenter);
connect(slider, SIGNAL(valueChanged(int)), SLOT(updateLabel()));
diff --git a/src/plugins/Ui/qsui/listwidgetdrawer.cpp b/src/plugins/Ui/qsui/listwidgetdrawer.cpp
index b819fed4d..02ba92a2e 100644
--- a/src/plugins/Ui/qsui/listwidgetdrawer.cpp
+++ b/src/plugins/Ui/qsui/listwidgetdrawer.cpp
@@ -102,7 +102,7 @@ void ListWidgetDrawer::readSettings()
m_font.setBold(true);
m_bold_metrics = new QFontMetrics(m_font);
m_font.setBold(false);
- m_padding = m_metrics->width("9")/2;
+ m_padding = m_metrics->horizontalAdvance("9")/2;
m_row_height = m_metrics->lineSpacing() + 1;
}
@@ -134,7 +134,7 @@ void ListWidgetDrawer::calculateNumberWidth(int count)
{
//song numbers width
if(m_show_number && m_align_numbres && count)
- m_number_width = m_bold_metrics->width("9") * QString::number(count).size();
+ m_number_width = m_bold_metrics->horizontalAdvance("9") * QString::number(count).size();
else
m_number_width = 0;
}
@@ -171,10 +171,10 @@ void ListWidgetDrawer::prepareRow(ListWidgetRow *row)
row->lengthColumnWidth = 0;
if(m_show_lengths && !row->length.isEmpty())
- row->lengthColumnWidth += metrics->width(row->length) + m_padding;
+ row->lengthColumnWidth += metrics->horizontalAdvance(row->length) + m_padding;
if(!row->extraString.isEmpty())
- row->lengthColumnWidth += m_extra_metrics->width(row->extraString) + m_padding;
+ row->lengthColumnWidth += m_extra_metrics->horizontalAdvance(row->extraString) + m_padding;
}
//elide title
@@ -196,10 +196,10 @@ void ListWidgetDrawer::prepareRow(ListWidgetRow *row)
int size = row->sizes[i];
if(i == row->trackStateColumn && !row->extraString.isEmpty())
{
- int text_size = qMax(0, size - 3 * m_padding - m_extra_metrics->width(row->extraString));
+ int text_size = qMax(0, size - 3 * m_padding - m_extra_metrics->horizontalAdvance(row->extraString));
row->titles[i] = metrics->elidedText (row->titles[i], Qt::ElideRight, text_size);
row->extraString = m_extra_metrics->elidedText(row->extraString, Qt::ElideRight,
- size - 3 * m_padding - metrics->width(row->titles[i]));
+ size - 3 * m_padding - metrics->horizontalAdvance(row->titles[i]));
}
else
{
@@ -269,7 +269,7 @@ void ListWidgetDrawer::drawSeparator(QPainter *painter, ListWidgetRow *row, bool
painter->setPen(row->flags & ListWidgetRow::SELECTED ? m_highlighted : m_group_text);
if(rtl)
- sx = row->rect.right() - sx - m_metrics->width(row->titles[0]);
+ sx = row->rect.right() - sx - m_metrics->horizontalAdvance(row->titles[0]);
else
sx += row->rect.x();
@@ -280,7 +280,7 @@ void ListWidgetDrawer::drawSeparator(QPainter *painter, ListWidgetRow *row, bool
if(rtl)
{
painter->drawLine(row->rect.x() + 5, sy, sx - 5, sy);
- painter->drawLine(sx + m_metrics->width(row->titles[0]) + 5, sy,
+ painter->drawLine(sx + m_metrics->horizontalAdvance(row->titles[0]) + 5, sy,
row->rect.right() - row->numberColumnWidth - m_padding, sy);
if(m_show_splitters && row->numberColumnWidth)
{
@@ -292,7 +292,7 @@ void ListWidgetDrawer::drawSeparator(QPainter *painter, ListWidgetRow *row, bool
else
{
painter->drawLine(sx - 45, sy, sx - 5, sy);
- painter->drawLine(sx + m_metrics->width(row->titles[0]) + 5, sy,
+ painter->drawLine(sx + m_metrics->horizontalAdvance(row->titles[0]) + 5, sy,
row->rect.width(), sy);
if(m_show_splitters && row->numberColumnWidth)
{
@@ -345,14 +345,14 @@ void ListWidgetDrawer::drawTrack(QPainter *painter, ListWidgetRow *row, bool rtl
}
}
- sx -= metrics->width(row->titles[0]);
+ sx -= metrics->horizontalAdvance(row->titles[0]);
painter->drawText(sx - m_padding, sy, row->titles[0]);
sx = row->rect.x() + m_padding;
if(m_show_lengths && !row->length.isEmpty())
{
painter->drawText(sx, sy, row->length);
- sx += metrics->width(row->length);
+ sx += metrics->horizontalAdvance(row->length);
sx += m_padding;
}
@@ -372,18 +372,18 @@ void ListWidgetDrawer::drawTrack(QPainter *painter, ListWidgetRow *row, bool rtl
if(row->alignment[i] == ListWidgetRow::ALIGN_LEFT)
{
title_x = sx - row->sizes[i] + m_padding;
- extra_x = draw_extra ? sx - m_padding - m_extra_metrics->width(row->extraString) : 0;
+ extra_x = draw_extra ? sx - m_padding - m_extra_metrics->horizontalAdvance(row->extraString) : 0;
}
else if(row->alignment[i] == ListWidgetRow::ALIGN_RIGHT)
{
- title_x = sx - m_padding - metrics->width(row->titles[i]);
+ title_x = sx - m_padding - metrics->horizontalAdvance(row->titles[i]);
extra_x = draw_extra ? sx - row->sizes[i] + m_padding : 0;
}
else
{
- title_x = sx - row->sizes[i] / 2 - metrics->width(row->titles[i]) / 2 +
- (draw_extra ? (m_extra_metrics->width(row->extraString) + m_padding) / 2 : 0);
- extra_x = draw_extra ? title_x - metrics->width(row->extraString) - m_padding : 0;
+ title_x = sx - row->sizes[i] / 2 - metrics->horizontalAdvance(row->titles[i]) / 2 +
+ (draw_extra ? (m_extra_metrics->horizontalAdvance(row->extraString) + m_padding) / 2 : 0);
+ extra_x = draw_extra ? title_x - metrics->horizontalAdvance(row->extraString) - m_padding : 0;
}
painter->drawText(title_x, sy, row->titles[i]);
@@ -415,7 +415,7 @@ void ListWidgetDrawer::drawTrack(QPainter *painter, ListWidgetRow *row, bool rtl
{
sx += row->numberColumnWidth;
QString number = QString("%1").arg(row->number);
- painter->drawText(sx - m_padding - metrics->width(number), sy, number);
+ painter->drawText(sx - m_padding - metrics->horizontalAdvance(number), sy, number);
if(m_show_splitters)
{
painter->setPen(row->flags & ListWidgetRow::SELECTED ? m_highlighted : m_splitter);
@@ -429,14 +429,14 @@ void ListWidgetDrawer::drawTrack(QPainter *painter, ListWidgetRow *row, bool rtl
if(m_show_lengths && !row->length.isEmpty())
{
- sx -= metrics->width(row->length);
+ sx -= metrics->horizontalAdvance(row->length);
painter->drawText(sx, sy, row->length);
sx -= m_padding;
}
if(!row->extraString.isEmpty())
{
- sx -= m_extra_metrics->width(row->extraString);
+ sx -= m_extra_metrics->horizontalAdvance(row->extraString);
painter->setFont(m_extra_font);
painter->drawText(sx, sy, row->extraString);
}
@@ -451,18 +451,18 @@ void ListWidgetDrawer::drawTrack(QPainter *painter, ListWidgetRow *row, bool rtl
if(row->alignment[i] == ListWidgetRow::ALIGN_LEFT)
{
title_x = sx + m_padding;
- extra_x = draw_extra ? sx + row->sizes[i] - m_padding - m_extra_metrics->width(row->extraString) : 0;
+ extra_x = draw_extra ? sx + row->sizes[i] - m_padding - m_extra_metrics->horizontalAdvance(row->extraString) : 0;
}
else if(row->alignment[i] == ListWidgetRow::ALIGN_RIGHT)
{
- title_x = sx + row->sizes[i] - m_padding - metrics->width(row->titles[i]);
+ title_x = sx + row->sizes[i] - m_padding - metrics->horizontalAdvance(row->titles[i]);
extra_x = draw_extra ? sx + m_padding : 0;
}
else
{
- title_x = sx + row->sizes[i] / 2 - metrics->width(row->titles[i]) / 2 -
- (draw_extra ? (m_extra_metrics->width(row->extraString) + m_padding) / 2 : 0);
- extra_x = draw_extra ? title_x + metrics->width(row->titles[i]) + m_padding : 0;
+ title_x = sx + row->sizes[i] / 2 - metrics->horizontalAdvance(row->titles[i]) / 2 -
+ (draw_extra ? (m_extra_metrics->horizontalAdvance(row->extraString) + m_padding) / 2 : 0);
+ extra_x = draw_extra ? title_x + metrics->horizontalAdvance(row->titles[i]) + m_padding : 0;
}
painter->drawText(title_x, sy, row->titles[i]);
diff --git a/src/plugins/Ui/qsui/playlistheader.cpp b/src/plugins/Ui/qsui/playlistheader.cpp
index 2ce470fcc..359972454 100644
--- a/src/plugins/Ui/qsui/playlistheader.cpp
+++ b/src/plugins/Ui/qsui/playlistheader.cpp
@@ -124,7 +124,7 @@ void PlayListHeader::readSettings()
QFont pl_font;
pl_font.fromString(settings.value("pl_font", qApp->font().toString()).toString());
- m_pl_padding = QFontMetrics(pl_font).width("9")/2;
+ m_pl_padding = QFontMetrics(pl_font).horizontalAdvance("9")/2;
if(!m_model->isSettingsLoaded()) //do not load settings several times
{
@@ -437,7 +437,7 @@ void PlayListHeader::mousePressEvent(QMouseEvent *e)
if(rtl)
{
- if(e->pos().x() < m_model->data(m_pressed_column, RECT).toRect().x() + m_metrics->width("9"))
+ if(e->pos().x() < m_model->data(m_pressed_column, RECT).toRect().x() + m_metrics->horizontalAdvance("9"))
{
m_old_size = size(m_pressed_column);
m_task = RESIZE;
@@ -450,7 +450,7 @@ void PlayListHeader::mousePressEvent(QMouseEvent *e)
}
else
{
- if(e->pos().x() > m_model->data(m_pressed_column, RECT).toRect().right() - m_metrics->width("9"))
+ if(e->pos().x() > m_model->data(m_pressed_column, RECT).toRect().right() - m_metrics->horizontalAdvance("9"))
{
m_old_size = size(m_pressed_column);
m_task = RESIZE;
@@ -565,14 +565,14 @@ void PlayListHeader::mouseMoveEvent(QMouseEvent *e)
{
if(rtl)
{
- if(column >= 0 && x < m_model->data(column, RECT).toRect().x() + m_metrics->width("9"))
+ if(column >= 0 && x < m_model->data(column, RECT).toRect().x() + m_metrics->horizontalAdvance("9"))
setCursor(Qt::SplitHCursor);
else
setCursor(Qt::ArrowCursor);
}
else
{
- if(column >= 0 && x > m_model->data(column, RECT).toRect().right() - m_metrics->width("9"))
+ if(column >= 0 && x > m_model->data(column, RECT).toRect().right() - m_metrics->horizontalAdvance("9"))
setCursor(Qt::SplitHCursor);
else
setCursor(Qt::ArrowCursor);
generated by cgit v1.2.3-13-gbd6f (git 2.30.0) at 2025-12-15 21:50:35 +0000