From 8ac2508eb094459c062d0c31b6367da393b4fa6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 19 Mar 2022 18:05:05 +0100 Subject: New upstream version 42.0 --- src/page-view.vala | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'src/page-view.vala') diff --git a/src/page-view.vala b/src/page-view.vala index 342df27..148dcca 100644 --- a/src/page-view.vala +++ b/src/page-view.vala @@ -45,8 +45,6 @@ public class PageView : Object } } - private Gdk.RGBA ruler_color; - private int ruler_width = 8; private int border_width = 2; @@ -86,13 +84,9 @@ public class PageView : Object public signal void size_changed (); public signal void changed (); - /* It is necessary to ask the ruler color since it is themed with the GTK */ - /* theme foreground color, and this class doesn't have any GTK widget */ - /* available to lookup the color. */ - public PageView (Page page, Gdk.RGBA ruler_color) + public PageView (Page page) { this.page = page; - this.ruler_color = ruler_color; page.pixels_changed.connect (page_pixels_changed_cb); page.size_changed.connect (page_size_changed_cb); page.crop_changed.connect (page_overlay_changed_cb); @@ -828,7 +822,10 @@ public class PageView : Object } } - public void render (Cairo.Context context) + /* It is necessary to ask the ruler color since it is themed with the GTK */ + /* theme foreground color, and this class doesn't have any GTK widget */ + /* available to lookup the color. */ + public void render (Cairo.Context context, Gdk.RGBA ruler_color) { update_animation (); update_page_view (); @@ -845,7 +842,7 @@ public class PageView : Object context.paint (); /* Draw page border */ - context.set_source_rgb (ruler_color.red, ruler_color.green, ruler_color.blue); + Gdk.cairo_set_source_rgba (context, ruler_color); context.set_line_width (border_width); context.rectangle (0, -- cgit v1.2.3