summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2010-05-31 23:45:17 +0200
committerAndrea Diamantini <adjam7@gmail.com>2010-05-31 23:45:17 +0200
commit25be5341cc992dc1d855980ad53df20f6cf32b2f (patch)
tree6124a18e6331972cbe332d534ef185fc7c052ca6 /src
parentFix Messages.sh (diff)
parentdefaut font size to 12 (minimal to 7) like konqueror (diff)
downloadrekonq-25be5341cc992dc1d855980ad53df20f6cf32b2f.tar.xz
Merge commit 'refs/merge-requests/126' of git://gitorious.org/rekonq/mainline into m126
Diffstat (limited to 'src')
-rw-r--r--src/application.cpp5
-rw-r--r--src/rekonq.kcfg4
2 files changed, 6 insertions, 3 deletions
diff --git a/src/application.cpp b/src/application.cpp
index fb52dc51..732bb273 100644
--- a/src/application.cpp
+++ b/src/application.cpp
@@ -448,7 +448,10 @@ void Application::updateConfiguration()
int minimumFontSize = ReKonfig::minFontSize();
float toPix = mainWindow()->currentTab()->view()->logicalDpiY()/72.0;
-
+
+ if (toPix < 96.0/72.0)
+ toPix = 96.0/72.0;
+
defaultSettings->setFontSize(QWebSettings::DefaultFontSize, qRound(defaultFontSize * toPix) );
defaultSettings->setFontSize(QWebSettings::MinimumFontSize, qRound(minimumFontSize * toPix) );
diff --git a/src/rekonq.kcfg b/src/rekonq.kcfg
index b934c6d5..1d6139ac 100644
--- a/src/rekonq.kcfg
+++ b/src/rekonq.kcfg
@@ -120,10 +120,10 @@
<default code="true">QWebSettings::globalSettings()->fontFamily(QWebSettings::FantasyFont)</default>
</entry>
<entry name="defaultFontSize" type="Int">
- <default>16</default>
+ <default>12</default>
</entry>
<entry name="minFontSize" type="Int">
- <default>8</default>
+ <default>7</default>
</entry>
</group>