Fix merge conflict

Signed-off-by: Michael Rasmussen <mir@datanom.net>

diff --git a/AUTHORS b/AUTHORS
index 5b5bae99be661dcd291bc414ba45291398604b45..3b551265cd57d1ef7f8f8bfb6ed0247d62707062 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -332,4 +332,8 @@ contributors (in addition to the above; based on Changelog)
        Jean Delvare
        Damian Poddebniak
        Alvar Penning
-    David Fletcher
+        David Fletcher
+       Orivej Desh
+       Steve Randall
+       Ramin Yaghoubzadeh Torky
+

diff --git a/src/gtk/authors.h b/src/gtk/authors.h
index 95ea5580f57c94f889b65adb9f898b8f391431f2..4ddf79509b4ccd1250285ae973eaec2a52def4c6 100644 (file)
--- a/src/gtk/authors.h
+++ b/src/gtk/authors.h
@@ -304,6 +304,7 @@ static char *CONTRIBS_LIST[] = {
 "Masahiro Tomita",
 "Tomita",
 "Topia",
+"Ramin Yaghoubzadeh Torky",
 "Anders Troback",
 "Tsutsui",
 "Aleksandar Urošević",

diff --git a/src/plugins/litehtml_viewer/lh_widget_text.cpp b/src/plugins/litehtml_viewer/lh_widget_text.cpp
index ed290559fd0da06ca59c5530ca41757eea7fdaf1..a832700fca774f1a018efdad092a3a0d409e0982 100644 (file)
--- a/src/plugins/litehtml_viewer/lh_widget_text.cpp
+++ b/src/plugins/litehtml_viewer/lh_widget_text.cpp
@@ -100,6 +100,10 @@ void lh_widget::draw_text( litehtml::uint_ptr hdc, const litehtml::tchar_t* text
        cairo_t *cr = (cairo_t *)hdc;
        PangoLayout *layout = pango_cairo_create_layout(cr);
        PangoContext *context = pango_layout_get_context(layout);
+       GdkScreen* screen = gdk_screen_get_default();
+       double dpi = gdk_screen_get_resolution(screen);
+
+       pango_cairo_context_set_resolution(context, dpi);
 
        if (fnt != NULL) {
                /* Set font */