mirror of
https://invent.kde.org/system/dolphin
synced 2024-09-19 16:31:21 +00:00
Respect floating point font sizes
BUG: 220632 svn path=/trunk/KDE/kdebase/apps/; revision=1084629
This commit is contained in:
parent
4b1277f078
commit
7a0cbf2573
|
@ -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()),
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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());
|
||||
|
||||
|
|
|
@ -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());
|
||||
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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());
|
||||
|
||||
|
|
Loading…
Reference in a new issue