Respect floating point font sizes

BUG: 220632

svn path=/trunk/KDE/kdebase/apps/; revision=1084629
This commit is contained in:
Christoph Feck 2010-02-03 10:55:13 +00:00
parent 4b1277f078
commit 7a0cbf2573
9 changed files with 15 additions and 12 deletions

View file

@ -85,9 +85,10 @@ DolphinColumnView::DolphinColumnView(QWidget* parent,
m_font = KGlobalSettings::generalFont();
} else {
m_font = QFont(settings->fontFamily(),
settings->fontSize(),
qRound(settings->fontSize()),
settings->fontWeight(),
settings->italicFont());
m_font.setPointSizeF(settings->fontSize());
}
connect(this, SIGNAL(viewportEntered()),

View file

@ -126,9 +126,10 @@ DolphinDetailsView::DolphinDetailsView(QWidget* parent,
m_font = KGlobalSettings::generalFont();
} else {
m_font = QFont(settings->fontFamily(),
settings->fontSize(),
qRound(settings->fontSize()),
settings->fontWeight(),
settings->italicFont());
m_font.setPointSizeF(settings->fontSize());
}
setVerticalScrollMode(QTreeView::ScrollPerPixel);

View file

@ -95,9 +95,10 @@ DolphinIconsView::DolphinIconsView(QWidget* parent,
m_font = KGlobalSettings::generalFont();
} else {
m_font = QFont(settings->fontFamily(),
settings->fontSize(),
qRound(settings->fontSize()),
settings->fontWeight(),
settings->italicFont());
m_font.setPointSizeF(settings->fontSize());
}
setWordWrap(settings->numberOfTextlines() > 1);

View file

@ -110,7 +110,7 @@ void ColumnViewSettingsPage::applySettings()
const QFont font = m_fontRequester->font();
settings->setUseSystemFont(m_fontRequester->mode() == DolphinFontRequester::SystemFont);
settings->setFontFamily(font.family());
settings->setFontSize(font.pointSize());
settings->setFontSize(font.pointSizeF());
settings->setItalicFont(font.italic());
settings->setFontWeight(font.weight());

View file

@ -104,7 +104,7 @@ void DetailsViewSettingsPage::applySettings()
const QFont font = m_fontRequester->font();
settings->setUseSystemFont(m_fontRequester->mode() == DolphinFontRequester::SystemFont);
settings->setFontFamily(font.family());
settings->setFontSize(font.pointSize());
settings->setFontSize(font.pointSizeF());
settings->setItalicFont(font.italic());
settings->setFontWeight(font.weight());

View file

@ -13,9 +13,9 @@
<label>Use system font</label>
<default>true</default>
</entry>
<entry name="FontSize" type="Int">
<entry name="FontSize" type="Double">
<label>Font size</label>
<default code="true">KGlobalSettings::generalFont().pointSize()</default>
<default code="true">KGlobalSettings::generalFont().pointSizeF()</default>
</entry>
<entry name="ItalicFont" type="Bool">
<label>Italic</label>

View file

@ -13,9 +13,9 @@
<label>Use system font</label>
<default>true</default>
</entry>
<entry name="FontSize" type="Int">
<entry name="FontSize" type="Double">
<label>Font size</label>
<default code="true">KGlobalSettings::generalFont().pointSize()</default>
<default code="true">KGlobalSettings::generalFont().pointSizeF()</default>
</entry>
<entry name="ItalicFont" type="Bool">
<label>Italic</label>

View file

@ -18,9 +18,9 @@
<label>Font family</label>
<default code="true">KGlobalSettings::generalFont().family()</default>
</entry>
<entry name="FontSize" type="Int">
<entry name="FontSize" type="Double">
<label>Font size</label>
<default code="true">KGlobalSettings::generalFont().pointSize()</default>
<default code="true">KGlobalSettings::generalFont().pointSizeF()</default>
</entry>
<entry name="ItalicFont" type="Bool">
<label>Italic</label>

View file

@ -173,7 +173,7 @@ void IconsViewSettingsPage::applySettings()
settings->setUseSystemFont(m_fontRequester->mode() == DolphinFontRequester::SystemFont);
settings->setFontFamily(font.family());
settings->setFontSize(font.pointSize());
settings->setFontSize(font.pointSizeF());
settings->setItalicFont(font.italic());
settings->setFontWeight(font.weight());