Use floating point font sizes for font requester

CCBUG: 220632

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

diff --git a/src/settings/columnviewsettingspage.cpp b/src/settings/columnviewsettingspage.cpp
index a935d4e93699c3e2d19bc173fd20935dd9ed3332..b1c3e119c31d42b324c4b3317f4b8c2a07f036ee 100644 (file)
--- a/src/settings/columnviewsettingspage.cpp
+++ b/src/settings/columnviewsettingspage.cpp
@@ -144,9 +144,10 @@ void ColumnViewSettingsPage::loadSettings()
         m_fontRequester->setMode(DolphinFontRequester::SystemFont);
     } else {
         QFont font(settings->fontFamily(),
         m_fontRequester->setMode(DolphinFontRequester::SystemFont);
     } else {
         QFont font(settings->fontFamily(),

-                   settings->fontSize());
+                   qRound(settings->fontSize()));

         font.setItalic(settings->italicFont());
         font.setWeight(settings->fontWeight());
         font.setItalic(settings->italicFont());
         font.setWeight(settings->fontWeight());

+        font.setPointSizeF(settings->fontSize());

         m_fontRequester->setMode(DolphinFontRequester::CustomFont);
         m_fontRequester->setCustomFont(font);
     }
         m_fontRequester->setMode(DolphinFontRequester::CustomFont);
         m_fontRequester->setCustomFont(font);
     }

diff --git a/src/settings/detailsviewsettingspage.cpp b/src/settings/detailsviewsettingspage.cpp
index 56646e8c454a7c526fe6637a7052d3376b4ea18e..dd819be7092ab4738433af7ab2544fb7dc1280c8 100644 (file)
--- a/src/settings/detailsviewsettingspage.cpp
+++ b/src/settings/detailsviewsettingspage.cpp
@@ -137,9 +137,10 @@ void DetailsViewSettingsPage::loadSettings()
         m_fontRequester->setMode(DolphinFontRequester::SystemFont);
     } else {
         QFont font(settings->fontFamily(),
         m_fontRequester->setMode(DolphinFontRequester::SystemFont);
     } else {
         QFont font(settings->fontFamily(),

-                   settings->fontSize());
+                   qRound(settings->fontSize()));

         font.setItalic(settings->italicFont());
         font.setWeight(settings->fontWeight());
         font.setItalic(settings->italicFont());
         font.setWeight(settings->fontWeight());

+        font.setPointSizeF(settings->fontSize());

         m_fontRequester->setMode(DolphinFontRequester::CustomFont);
         m_fontRequester->setCustomFont(font);
     }
         m_fontRequester->setMode(DolphinFontRequester::CustomFont);
         m_fontRequester->setCustomFont(font);
     }

diff --git a/src/settings/iconsviewsettingspage.cpp b/src/settings/iconsviewsettingspage.cpp
index dc3586c499dba80197cc305f6c2839239a706165..059a4a84611f88ea2f776573092d978b13c2a937 100644 (file)
--- a/src/settings/iconsviewsettingspage.cpp
+++ b/src/settings/iconsviewsettingspage.cpp
@@ -214,9 +214,10 @@ void IconsViewSettingsPage::loadSettings()
         m_fontRequester->setMode(DolphinFontRequester::SystemFont);
     } else {
         QFont font(settings->fontFamily(),
         m_fontRequester->setMode(DolphinFontRequester::SystemFont);
     } else {
         QFont font(settings->fontFamily(),

-                   settings->fontSize());
+                   qRound(settings->fontSize()));

         font.setItalic(settings->italicFont());
         font.setWeight(settings->fontWeight());
         font.setItalic(settings->italicFont());
         font.setWeight(settings->fontWeight());

+        font.setPointSizeF(settings->fontSize());

         m_fontRequester->setMode(DolphinFontRequester::CustomFont);
         m_fontRequester->setCustomFont(font);
     }
         m_fontRequester->setMode(DolphinFontRequester::CustomFont);
         m_fontRequester->setCustomFont(font);
     }