From 9d0c154884a9b10c2e45f269be0bb686da1c98c9 Mon Sep 17 00:00:00 2001
From: jcid <devnull@localhost>
Date: Mon, 8 Sep 2008 16:50:15 +0200
Subject: - Adjusted internal font sizes so the default font_factor is 1.0

---
 src/dialog.cc | 3 +--
 src/html.cc   | 4 ++--
 src/plain.cc  | 2 +-
 src/prefs.c   | 2 +-
 src/uicmd.cc  | 2 +-
 src/web.cc    | 2 +-
 6 files changed, 7 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/dialog.cc b/src/dialog.cc
index ebca3e0a..167ab38d 100644
--- a/src/dialog.cc
+++ b/src/dialog.cc
@@ -135,8 +135,7 @@ void *a_Dialog_make_text_window(const char *txt, const char *title)
     /* 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();
diff --git a/src/html.cc b/src/html.cc
index 4cecea48..40ef31c6 100644
--- a/src/html.cc
+++ b/src/html.cc
@@ -119,8 +119,8 @@ static void Html_tag_cleanup_at_close(DilloHtml *html, int TagIdx);
 /*-----------------------------------------------------------------------------
  * 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;
 
diff --git a/src/plain.cc b/src/plain.cc
index 0c8a528e..eb040122 100644
--- a/src/plain.cc
+++ b/src/plain.cc
@@ -100,7 +100,7 @@ DilloPlain::DilloPlain(BrowserWindow *p_bw, const DilloUrl *p_url)
 
    /* 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;
 
diff --git a/src/prefs.c b/src/prefs.c
index 3c04a621..797f2cf7 100644
--- a/src/prefs.c
+++ b/src/prefs.c
@@ -418,7 +418,7 @@ void a_Prefs_init(void)
    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;
diff --git a/src/uicmd.cc b/src/uicmd.cc
index 1df57488..d1761fca 100644
--- a/src/uicmd.cc
+++ b/src/uicmd.cc
@@ -90,7 +90,7 @@ BrowserWindow *a_UIcmd_browser_window_new(int ww, int wh, const void *v_ui)
    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);
diff --git a/src/web.cc b/src/web.cc
index ad7618c5..fa33866a 100644
--- a/src/web.cc
+++ b/src/web.cc
@@ -76,7 +76,7 @@ int a_Web_dispatch_by_type (const char *Type, DilloWeb *Web,
 
       /* 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;
 
-- 
cgit v1.2.3