summaryrefslogtreecommitdiff
path: root/beos
diff options
context:
space:
mode:
Diffstat (limited to 'beos')
-rw-r--r--beos/beos_font.cpp4
-rw-r--r--beos/beos_gui.cpp12
l---------beos/res/quirks.css1
3 files changed, 12 insertions, 5 deletions
diff --git a/beos/beos_font.cpp b/beos/beos_font.cpp
index 5549c51e6..f640859ca 100644
--- a/beos/beos_font.cpp
+++ b/beos/beos_font.cpp
@@ -366,10 +366,6 @@ void nsbeos_style_to_font(BFont &font, const plot_font_style_t *style)
//fprintf(stderr, "nsbeos_style_to_font: value %f unit %d\n", style->font_size.value.length.value, style->font_size.value.length.unit);
size = fstyle->size / FONT_SIZE_SCALE;
- //XXX: pango stuff ?
- if (size < abs(option_font_min_size / 10))
- size = option_font_min_size / 10;
-
//fprintf(stderr, "nsbeos_style_to_font: %f %d\n", size, style->font_size.value.length.unit);
font.SetSize(size);
diff --git a/beos/beos_gui.cpp b/beos/beos_gui.cpp
index 866c73023..0835a934c 100644
--- a/beos/beos_gui.cpp
+++ b/beos/beos_gui.cpp
@@ -96,6 +96,7 @@ bool gui_in_multitask = false;
bool replicated = false; /**< if we are running as a replicant */
char *default_stylesheet_url;
+char *quirks_stylesheet_url;
char *adblock_stylesheet_url;
char *options_file_location;
char *glade_file_location;
@@ -266,7 +267,7 @@ static char *generate_default_css()
return NULL;
const char *params[] = { 0 };
- if (!content_set_type(c, CONTENT_CSS, "text/css", params))
+ if (!content_set_type(c, CONTENT_CSS, "text/css", params, NULL))
return NULL;
if (!content_process_data(c, text.String(), text.Length()))
@@ -567,6 +568,14 @@ void gui_init(int argc, char** argv)
LOG(("Using '%s' as Default CSS URL", default_stylesheet_url));
#ifdef USE_RESOURCES
+ quirks_stylesheet_url = strdup("rsrc:/quirks.css,text/css");
+#else
+ find_resource(buf, "quirks.css", "./beos/res/quirks.css");
+ default_stylesheet_url = path_to_url(buf);
+#endif
+
+
+#ifdef USE_RESOURCES
adblock_stylesheet_url = strdup("rsrc:/adblock.css,text/css");
#else
find_resource(buf, "adblock.css", "./beos/res/adblock.css");
@@ -740,6 +749,7 @@ void gui_quit(void)
//options_save_tree(hotlist,option_hotlist_file,messages_get("TreeHotlist"));
free(default_stylesheet_url);
+ free(quirks_stylesheet_url);
free(adblock_stylesheet_url);
free(option_cookie_file);
free(option_cookie_jar);
diff --git a/beos/res/quirks.css b/beos/res/quirks.css
new file mode 120000
index 000000000..d9fb80334
--- /dev/null
+++ b/beos/res/quirks.css
@@ -0,0 +1 @@
+../../!NetSurf/Resources/Quirks,f79 \ No newline at end of file