From aab36b488647e298857b7ec24bce0f2b143e4520 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Fri, 20 Mar 2009 00:57:19 +0100
Subject: working on fixing font problem..

---
 src/mainwindow.cpp | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

(limited to 'src/mainwindow.cpp')

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 22110c59..56eb6ecc 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -314,28 +314,30 @@ void MainWindow::slotUpdateConf()
     // =========== Fonts ==============
     QWebSettings *defaultSettings = QWebSettings::globalSettings();
 
+    int fnSize = ReKonfig::fontSize();
+
     QFont standardFont = ReKonfig::standardFont();
-    if( !standardFont.exactMatch() )
-    {
-        kWarning() << "Webkit Standard Font doesn't match! Setting to KDE general font..";
-        standardFont = KGlobalSettings::generalFont();
-        ReKonfig::setStandardFont( standardFont );
-        ReKonfig::self()->writeConfig();
-    }
+//     if( !standardFont.exactMatch() )
+//     {
+//         kWarning() << "Webkit Standard Font doesn't match! Setting to KDE general font..";
+//         standardFont = KGlobalSettings::generalFont();
+//         ReKonfig::setStandardFont( standardFont );
+//         ReKonfig::self()->writeConfig();
+//     }
     defaultSettings->setFontFamily(QWebSettings::StandardFont, standardFont.family());
-    defaultSettings->setFontSize(QWebSettings::DefaultFontSize, standardFont.pointSize());
+    defaultSettings->setFontSize(QWebSettings::DefaultFontSize, fnSize);
 
 
     QFont fixedFont = ReKonfig::fixedFont();
-    if( !fixedFont.exactMatch() )
-    {
-        kWarning() << "Webkit Fixed Font doesn't match! Setting to KDE fixed font..";
-        fixedFont = KGlobalSettings::fixedFont();
-        ReKonfig::setFixedFont( fixedFont );
-        ReKonfig::self()->writeConfig();
-    }
+//     if( !fixedFont.exactMatch() )
+//     {
+//         kWarning() << "Webkit Fixed Font doesn't match! Setting to KDE fixed font..";
+//         fixedFont = KGlobalSettings::fixedFont();
+//         ReKonfig::setFixedFont( fixedFont );
+//         ReKonfig::self()->writeConfig();
+//     }
     defaultSettings->setFontFamily(QWebSettings::FixedFont, fixedFont.family());
-    defaultSettings->setFontSize(QWebSettings::DefaultFixedFontSize, fixedFont.pointSize());
+    defaultSettings->setFontSize(QWebSettings::DefaultFixedFontSize, fnSize);
 
 
     // =========== Privacy ==============
-- 
cgit v1.2.1