changeset 937:61ac49615a40

merge
author Jorge Arellano Cid <jcid@dillo.org>
date Wed, 11 Feb 2009 15:25:32 -0300
parents cadfaa42e7ce (current diff) b43ce176d305 (diff)
children b134ea74331b
files
diffstat 5 files changed, 12 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed Feb 11 15:23:55 2009 -0300
+++ b/ChangeLog	Wed Feb 11 15:25:32 2009 -0300
@@ -50,6 +50,7 @@
 +- Reduced warnings with gcc-4.3.
    Patch: Thomas Orgis
 +- Made the parser recognize "[^ ]/>"-terminated XML elements.
+ - Added "font_min_size" dillorc option.
    Patch: Johannes Hofmann
 +- Added the "middle_click_drags_page" dillorc option.
    Patch: Jorge Arellano Cid, Thomas Orgis
--- a/dillorc	Wed Feb 11 15:23:55 2009 -0300
+++ b/dillorc	Wed Feb 11 15:25:32 2009 -0300
@@ -49,10 +49,13 @@
 #font_fantasy="DejaVu Sans"
 #font_monospace="DejaVu Sans Mono"
 
-# All fontsizes are scaled by this value
+# All font sizes are scaled by this value
 # font_factor=1.5
 #font_factor=1.0
 
+# Minimum font size
+#font_min_size=6
+
 # Show tooltip popup for images?
 # Note: We use the "title" attribute and not "alt".
 #       More info at: http://bugzilla.mozilla.org/show_bug.cgi?id=25537
--- a/src/prefs.c	Wed Feb 11 15:23:55 2009 -0300
+++ b/src/prefs.c	Wed Feb 11 15:25:32 2009 -0300
@@ -163,6 +163,7 @@
    { "font_cursive", &prefs.font_cursive, PREFS_STRING },
    { "font_factor", &prefs.font_factor, PREFS_DOUBLE },
    { "font_fantasy", &prefs.font_fantasy, PREFS_STRING },
+   { "font_min_size", &prefs.font_min_size, PREFS_INT32 },
    { "font_monospace", &prefs.font_monospace, PREFS_STRING },
    { "font_sans_serif", &prefs.font_sans_serif, PREFS_STRING },
    { "font_serif", &prefs.font_serif, PREFS_STRING },
@@ -267,6 +268,7 @@
    prefs.focus_new_tab = TRUE;
    prefs.font_cursive = dStrdup(D_FONT_CURSIVE);
    prefs.font_factor = 1.0;
+   prefs.font_min_size = 6;
    prefs.font_fantasy = dStrdup(D_FONT_FANTASY);
    prefs.font_monospace = dStrdup(D_FONT_MONOSPACE);
    prefs.font_sans_serif = dStrdup(D_FONT_SANS_SERIF);
--- a/src/prefs.h	Wed Feb 11 15:23:55 2009 -0300
+++ b/src/prefs.h	Wed Feb 11 15:25:32 2009 -0300
@@ -44,6 +44,7 @@
    bool_t w3c_plus_heuristics;
    bool_t focus_new_tab;
    double font_factor;
+   int32_t font_min_size;
    bool_t show_back;
    bool_t show_forw;
    bool_t show_home;
--- a/src/styleengine.cc	Wed Feb 11 15:23:55 2009 -0300
+++ b/src/styleengine.cc	Wed Feb 11 15:25:32 2009 -0300
@@ -222,6 +222,10 @@
                computeValue (&fontAttrs.size, p->value.intVal, parentFont,
                   parentFont->size);
             }
+
+            if (fontAttrs.size < prefs.font_min_size)
+               fontAttrs.size = prefs.font_min_size;
+
             break;
          case CSS_PROPERTY_FONT_STYLE:
             fontAttrs.style = (FontStyle) p->value.intVal;