talons

commit c79a52334e9cb36273182aea79db6d99a2f09e8a
parent 1135efc54dcf4a6ec5b39be7cb6d5b0255f30dab
Author: Michael Rasmussen <mir@datanom.net>
Date:   Wed, 17 Mar 2021 16:36:53 +0100

Fix merge conflict

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

Diffstat:
M
AUTHORS
 | 
6
+++++-
M
src/gtk/authors.h
 | 
1
+
M
src/plugins/litehtml_viewer/lh_widget_text.cpp
 | 
4
++++

3 files changed, 10 insertions(+), 1 deletion(-)
diff --git 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
@@ -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
@@ -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 */