diff options
| -rw-r--r-- | src/ui/configdialog.cpp | 9 | ||||
| -rw-r--r-- | src/ui/listwidget.cpp | 7 |
2 files changed, 10 insertions, 6 deletions
diff --git a/src/ui/configdialog.cpp b/src/ui/configdialog.cpp index 630a791ff..229fa14c6 100644 --- a/src/ui/configdialog.cpp +++ b/src/ui/configdialog.cpp @@ -375,13 +375,16 @@ void ConfigDialog::loadPluginsInfo() void ConfigDialog::loadFonts() { QSettings settings (Qmmp::configFile(), QSettings::IniFormat); - QString fontname = settings.value ( "PlayList/Font","" ).toString(); + QString fontname = settings.value ( "PlayList/Font").toString(); QFont font; - font.fromString(fontname); + if(!fontname.isEmpty()) + font.fromString(fontname); ui.plFontLabel->setText (font.family () + " " + QString::number(font.pointSize ())); ui.plFontLabel->setFont(font); - fontname = settings.value ("MainWindow/Font","").toString(); + fontname = settings.value ("MainWindow/Font").toString(); + if(!fontname.isEmpty()) + font.fromString(fontname); font.fromString(fontname); ui.mainFontLabel->setText (font.family () + " " + QString::number(font.pointSize ())); ui.mainFontLabel->setFont(font); diff --git a/src/ui/listwidget.cpp b/src/ui/listwidget.cpp index b22b5556e..2a639d99d 100644 --- a/src/ui/listwidget.cpp +++ b/src/ui/listwidget.cpp @@ -66,8 +66,9 @@ ListWidget::~ListWidget() void ListWidget::readSettings() { QSettings settings(Qmmp::configFile(), QSettings::IniFormat); - QString fontname = settings.value("PlayList/Font","").toString(); - m_font.fromString(fontname); + QString fontname = settings.value("PlayList/Font").toString(); + if (!fontname.isEmpty()) + m_font.fromString(fontname); m_show_protocol = settings.value ("PlayList/show_protocol", FALSE).toBool(); if (m_update) @@ -461,7 +462,7 @@ int ListWidget::rowAt( int y) const { for (int i = 0; i < qMin(m_rows, m_model->count() - m_first); ++i ) { - if ((y >= 2+i*m_metrics->ascent())&&(y < 2+(i+1)*m_metrics->ascent())) + if ((y >= 2 + i * m_metrics->ascent()) && (y < 2 + (i+1) * m_metrics->ascent())) return m_first + i; } return INVALID_ROW; |