diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/dolphincolumnview.cpp | 3 | ||||
| -rw-r--r-- | src/dolphindetailsview.cpp | 3 | ||||
| -rw-r--r-- | src/dolphiniconsview.cpp | 3 | ||||
| -rw-r--r-- | src/settings/columnviewsettingspage.cpp | 2 | ||||
| -rw-r--r-- | src/settings/detailsviewsettingspage.cpp | 2 | ||||
| -rw-r--r-- | src/settings/dolphin_columnmodesettings.kcfg | 4 | ||||
| -rw-r--r-- | src/settings/dolphin_detailsmodesettings.kcfg | 4 | ||||
| -rw-r--r-- | src/settings/dolphin_iconsmodesettings.kcfg | 4 | ||||
| -rw-r--r-- | src/settings/iconsviewsettingspage.cpp | 2 |
9 files changed, 15 insertions, 12 deletions
diff --git a/src/dolphincolumnview.cpp b/src/dolphincolumnview.cpp index 3437de499..6d265c01f 100644 --- a/src/dolphincolumnview.cpp +++ b/src/dolphincolumnview.cpp @@ -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()), diff --git a/src/dolphindetailsview.cpp b/src/dolphindetailsview.cpp index 5a6342098..8292db8aa 100644 --- a/src/dolphindetailsview.cpp +++ b/src/dolphindetailsview.cpp @@ -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); diff --git a/src/dolphiniconsview.cpp b/src/dolphiniconsview.cpp index b6fe9d343..1f6f007d3 100644 --- a/src/dolphiniconsview.cpp +++ b/src/dolphiniconsview.cpp @@ -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); diff --git a/src/settings/columnviewsettingspage.cpp b/src/settings/columnviewsettingspage.cpp index 4dfb0a78f..a935d4e93 100644 --- a/src/settings/columnviewsettingspage.cpp +++ b/src/settings/columnviewsettingspage.cpp @@ -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()); diff --git a/src/settings/detailsviewsettingspage.cpp b/src/settings/detailsviewsettingspage.cpp index ee89ba68c..56646e8c4 100644 --- a/src/settings/detailsviewsettingspage.cpp +++ b/src/settings/detailsviewsettingspage.cpp @@ -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()); diff --git a/src/settings/dolphin_columnmodesettings.kcfg b/src/settings/dolphin_columnmodesettings.kcfg index 498671efa..29d86f16d 100644 --- a/src/settings/dolphin_columnmodesettings.kcfg +++ b/src/settings/dolphin_columnmodesettings.kcfg @@ -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> diff --git a/src/settings/dolphin_detailsmodesettings.kcfg b/src/settings/dolphin_detailsmodesettings.kcfg index 74f05edb6..49eced3e6 100644 --- a/src/settings/dolphin_detailsmodesettings.kcfg +++ b/src/settings/dolphin_detailsmodesettings.kcfg @@ -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> diff --git a/src/settings/dolphin_iconsmodesettings.kcfg b/src/settings/dolphin_iconsmodesettings.kcfg index 8bd1ef325..634167b18 100644 --- a/src/settings/dolphin_iconsmodesettings.kcfg +++ b/src/settings/dolphin_iconsmodesettings.kcfg @@ -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> diff --git a/src/settings/iconsviewsettingspage.cpp b/src/settings/iconsviewsettingspage.cpp index 78e9adf7a..dc3586c49 100644 --- a/src/settings/iconsviewsettingspage.cpp +++ b/src/settings/iconsviewsettingspage.cpp @@ -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()); |