diff options
| author | Matthew Petroff <[email protected]> | 2016-10-19 12:36:30 -0400 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2017-08-12 22:01:34 +0200 |
| commit | a134dcdcd6e4b6934c5e8f3cc66ac824d9914d5b (patch) | |
| tree | bbe658f472fde31e398e90ed74c888f332a71022 | |
| parent | b6a20b77926727af99b39773ee104ffa457c604f (diff) | |
| download | atril-a134dcdcd6e4b6934c5e8f3cc66ac824d9914d5b.tar.bz2 atril-a134dcdcd6e4b6934c5e8f3cc66ac824d9914d5b.tar.xz | |
Take monitor scale factor into account when calculating zoom.
https://github.com/linuxmint/xreader/commit/c47a1f4
| -rw-r--r-- | libdocument/ev-document-misc.c | 6 | ||||
| -rw-r--r-- | libdocument/ev-document-misc.h | 2 | ||||
| -rw-r--r-- | libview/ev-annotation-window.c | 4 | ||||
| -rw-r--r-- | previewer/ev-previewer-window.c | 4 | ||||
| -rw-r--r-- | shell/ev-window.c | 4 |
5 files changed, 15 insertions, 5 deletions
diff --git a/libdocument/ev-document-misc.c b/libdocument/ev-document-misc.c index d4f16482..fc47a9ee 100644 --- a/libdocument/ev-document-misc.c +++ b/libdocument/ev-document-misc.c @@ -372,7 +372,7 @@ ev_document_misc_invert_pixbuf (GdkPixbuf *pixbuf) } gdouble -ev_document_misc_get_screen_dpi (GdkScreen *screen) +ev_document_misc_get_screen_dpi (GdkScreen *screen, gint monitor) { gdouble dp, di; @@ -382,6 +382,10 @@ ev_document_misc_get_screen_dpi (GdkScreen *screen) /*diagonal in inches*/ di = hypot (gdk_screen_get_width_mm(screen), gdk_screen_get_height_mm (screen)) / 25.4; +#ifdef HAVE_HIDPI_SUPPORT + di /= gdk_screen_get_monitor_scale_factor(screen, monitor); +#endif + return (dp / di); } diff --git a/libdocument/ev-document-misc.h b/libdocument/ev-document-misc.h index 98c791ca..e6480ed0 100644 --- a/libdocument/ev-document-misc.h +++ b/libdocument/ev-document-misc.h @@ -58,7 +58,7 @@ cairo_surface_t *ev_document_misc_surface_rotate_and_scale (cairo_surface_t *sur void ev_document_misc_invert_surface (cairo_surface_t *surface); void ev_document_misc_invert_pixbuf (GdkPixbuf *pixbuf); -gdouble ev_document_misc_get_screen_dpi (GdkScreen *screen); +gdouble ev_document_misc_get_screen_dpi (GdkScreen *screen, gint monitor); gchar *ev_document_misc_format_date (GTime utime); diff --git a/libview/ev-annotation-window.c b/libview/ev-annotation-window.c index 217873e5..b352c2fd 100644 --- a/libview/ev-annotation-window.c +++ b/libview/ev-annotation-window.c @@ -97,9 +97,11 @@ static gdouble get_screen_dpi (EvAnnotationWindow *window) { GdkScreen *screen; + gint monitor; screen = gtk_window_get_screen (GTK_WINDOW (window)); - return ev_document_misc_get_screen_dpi (screen); + monitor = gdk_screen_get_monitor_at_window(screen, gtk_widget_get_window(GTK_WIDGET(GTK_WINDOW(window)))); + return ev_document_misc_get_screen_dpi (screen, monitor); } static void diff --git a/previewer/ev-previewer-window.c b/previewer/ev-previewer-window.c index e92eb75d..45545fbf 100644 --- a/previewer/ev-previewer-window.c +++ b/previewer/ev-previewer-window.c @@ -71,9 +71,11 @@ static gdouble get_screen_dpi (EvPreviewerWindow *window) { GdkScreen *screen; + gint monitor; screen = gtk_window_get_screen (GTK_WINDOW (window)); - return ev_document_misc_get_screen_dpi (screen); + monitor = gdk_screen_get_monitor_at_window(screen, gtk_widget_get_window(GTK_WIDGET(GTK_WINDOW(window)))); + return ev_document_misc_get_screen_dpi (screen, monitor); } #if GTKUNIXPRINT_ENABLED diff --git a/shell/ev-window.c b/shell/ev-window.c index 5c7124b4..59a3a27e 100644 --- a/shell/ev-window.c +++ b/shell/ev-window.c @@ -384,9 +384,11 @@ static gdouble get_screen_dpi (EvWindow *window) { GdkScreen *screen; + gint monitor; screen = gtk_window_get_screen (GTK_WINDOW (window)); - return ev_document_misc_get_screen_dpi (screen); + monitor = gdk_screen_get_monitor_at_window(screen, gtk_widget_get_window(GTK_WIDGET(GTK_WINDOW(window)))); + return ev_document_misc_get_screen_dpi (screen, monitor); } static void |