changeset 327:7d83c41d52b9

- Adjusted internal font sizes so the default font_factor is 1.0
author jcid
date Mon, 08 Sep 2008 16:50:15 +0200
parents c9a9a79a96c4
children 6a5b6bbf9836
files dillo2rc src/dialog.cc src/html.cc src/plain.cc src/prefs.c src/uicmd.cc src/web.cc
diffstat 7 files changed, 8 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/dillo2rc	Thu Sep 04 23:42:30 2008 +0200
+++ b/dillo2rc	Mon Sep 08 16:50:15 2008 +0200
@@ -44,7 +44,7 @@
 
 # All fontsizes are scaled by this value
 # font_factor=1.5
-#font_factor=1.2
+#font_factor=1.0
 
 # Show tooltip popup for images?
 # Note: We use the "title" attribute and not "alt".
--- a/src/dialog.cc	Thu Sep 04 23:42:30 2008 +0200
+++ b/src/dialog.cc	Mon Sep 08 16:50:15 2008 +0200
@@ -135,8 +135,7 @@
     /* enable wrapping lines; text uses entire width of window */
     td->wrap_mode(true, 0);
 
-    /* 11.0 instead of 12.0 because the dialog's font is a bit bigger */
-    td->textsize((int) rint(11.0 * prefs.font_factor));
+    td->textsize((int) rint(13.0 * prefs.font_factor));
     fltk::setfont(td->textfont(), td->textsize());
 
     lines = td->total_lines();
--- a/src/html.cc	Thu Sep 04 23:42:30 2008 +0200
+++ b/src/html.cc	Mon Sep 08 16:50:15 2008 +0200
@@ -119,8 +119,8 @@
 /*-----------------------------------------------------------------------------
  * Local Data
  *---------------------------------------------------------------------------*/
-/* The following array of font sizes has to be _strictly_ crescent */
-static const int FontSizes[] = {8, 10, 12, 14, 18, 24};
+/* The following array of font sizes has to be _strictly_ increasing */
+static const int FontSizes[] = {10, 12, 14, 18, 22, 28};
 static const int FontSizesNum = 6;
 static const int FontSizesBase = 2;
 
--- a/src/plain.cc	Thu Sep 04 23:42:30 2008 +0200
+++ b/src/plain.cc	Mon Sep 08 16:50:15 2008 +0200
@@ -100,7 +100,7 @@
 
    /* Create the font and attribute for the page. */
    fontAttrs.name = prefs.fw_fontname;
-   fontAttrs.size = (int) rint(12.0 * prefs.font_factor);
+   fontAttrs.size = (int) rint(14.0 * prefs.font_factor);
    fontAttrs.weight = 400;
    fontAttrs.style = style::FONT_STYLE_NORMAL;
 
--- a/src/prefs.c	Thu Sep 04 23:42:30 2008 +0200
+++ b/src/prefs.c	Mon Sep 08 16:50:15 2008 +0200
@@ -418,7 +418,7 @@
    prefs.small_icons = FALSE;
    prefs.limit_text_width = FALSE;
    prefs.w3c_plus_heuristics = TRUE;
-   prefs.font_factor = 1.2;
+   prefs.font_factor = 1.0;
    prefs.show_back=TRUE;
    prefs.show_forw=TRUE;
    prefs.show_home=TRUE;
--- a/src/uicmd.cc	Thu Sep 04 23:42:30 2008 +0200
+++ b/src/uicmd.cc	Mon Sep 08 16:50:15 2008 +0200
@@ -90,7 +90,7 @@
    layout->attachView (viewport);
    new_ui->set_render_layout(*viewport);
 
-   viewport->setScrollStep((int) rint(12.0 * prefs.font_factor));
+   viewport->setScrollStep((int) rint(14.0 * prefs.font_factor));
 
    // Now, create a new browser window structure
    BrowserWindow *new_bw = a_Bw_new(ww, wh, 0);
--- a/src/web.cc	Thu Sep 04 23:42:30 2008 +0200
+++ b/src/web.cc	Mon Sep 08 16:50:15 2008 +0200
@@ -76,7 +76,7 @@
 
       /* Set a style for the widget */
       fontAttrs.name = prefs.vw_fontname;
-      fontAttrs.size = (int) rint(12.0 * prefs.font_factor);
+      fontAttrs.size = (int) rint(14.0 * prefs.font_factor);
       fontAttrs.weight = 400;
       fontAttrs.style = style::FONT_STYLE_NORMAL;