From: Carlos Garcia Campos <carlosgc@gnome.org>
Date: Wed, 22 Dec 2010 16:02:15 +0000 (+0100)
Subject: libdocument: Port To GtkStyleContext
X-Git-Tag: EVINCE_2_91_4~7
X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=commitdiff_plain;h=478dd74e4201b44b5c921fd0bb69b0c4e43bcd8a;p=evince.git

libdocument: Port To GtkStyleContext
---

diff --git a/libdocument/ev-document-misc.c b/libdocument/ev-document-misc.c
index f1a30957..01676b53 100644
--- a/libdocument/ev-document-misc.c
+++ b/libdocument/ev-document-misc.c
@@ -140,10 +140,22 @@ ev_document_misc_paint_one_page (cairo_t      *cr,
 				 gboolean      highlight,
 				 gboolean      inverted_colors)
 {
-	GtkStyle    *style = gtk_widget_get_style (widget);
-	GtkStateType state = gtk_widget_get_state (widget);
-
-	gdk_cairo_set_source_color (cr, highlight ? &style->text[state] : &style->dark[state]);
+	GtkStyleContext *context = gtk_widget_get_style_context (widget);
+	GtkStateFlags state = gtk_widget_get_state_flags (widget);
+        GdkRGBA fg, bg, shade_bg;
+        GtkSymbolicColor *c1, *c2;
+
+        gtk_style_context_get_background_color (context, state, &bg);
+        gtk_style_context_get_color (context, state, &fg);
+
+        // FIXME: should we cache the shade_bg?
+        c1 = gtk_symbolic_color_new_literal (&bg);
+        c2 = gtk_symbolic_color_new_shade (c1, 0.7);
+        gtk_symbolic_color_resolve (c2, NULL, &shade_bg);
+        gtk_symbolic_color_unref (c1);
+        gtk_symbolic_color_unref (c2);
+
+	gdk_cairo_set_source_rgba (cr, highlight ? &fg : &shade_bg);
 	gdk_cairo_rectangle (cr, area);
 	cairo_fill (cr);
 
@@ -158,7 +170,7 @@ ev_document_misc_paint_one_page (cairo_t      *cr,
 			 area->height - (border->top + border->bottom));
 	cairo_fill (cr);
 
-	gdk_cairo_set_source_color (cr, &style->mid[state]);
+	gdk_cairo_set_source_rgba (cr, &bg);
 	cairo_rectangle (cr,
 			 area->x,
 			 area->y + area->height - (border->bottom - border->top),