Respect floating point font sizes

BUG: 220632

svn path=/trunk/KDE/kdebase/apps/; revision=1084629

diff --git a/src/dolphincolumnview.cpp b/src/dolphincolumnview.cpp
index 3437de4990cfb408dc44e94029ef887ba3376592..6d265c01fac932c910a9a749b10da09f570a7b20 100644 (file)
--- 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 5a6342098de422d42c8e7cec0650d046bd078373..8292db8aa265676027f629cbdf6d3c2b60eaf5eb 100644 (file)
--- 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 b6fe9d343ec28915d220e1d1da6c83de91a64a02..1f6f007d347864510f6f1595a8388d8aff3be95c 100644 (file)
--- 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 4dfb0a78f916e04f812082a74594ababda27b7b7..a935d4e93699c3e2d19bc173fd20935dd9ed3332 100644 (file)
--- 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 ee89ba68c650811359f858f8fea63435d9b6f910..56646e8c454a7c526fe6637a7052d3376b4ea18e 100644 (file)
--- 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 498671efac25b7ee87ba67687669e282bf46ce1c..29d86f16d47b30da50b323fef331c49ea179b74b 100644 (file)
--- 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 74f05edb64aeebc8f2f62a4b13d0496f39d1519f..49eced3e6f0ac23b9464fa51025dda152428e5c7 100644 (file)
--- 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 8bd1ef325732712c6c7fd3acc8df54c860aebc3e..634167b18b62479ed18dc17749be73dd8b5871c4 100644 (file)
--- 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 78e9adf7aaeb676f73fec931c352101f147d87c2..dc3586c499dba80197cc305f6c2839239a706165 100644 (file)
--- 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());