Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNickolay V. Shmyrev <nshmyrev@src.gnome.org>2006-02-24 19:13:39 (GMT)
committer Nickolay V. Shmyrev <nshmyrev@src.gnome.org>2006-02-24 19:13:39 (GMT)
commiteae0b2268b6b4afb3cf1bf76a6358b3d720a3be5 (patch)
treed0a3eb3dc5d16cd4c3e444b69e4fa34fcb608b0e
parent43f12175ba221f7c241f0c9cde323c23b8db53e8 (diff)
Clairfy what page the toolbar page number applies to. Fix for the bug
* backend/ev-document-misc.c: (ev_document_misc_paint_one_page): * backend/ev-document-misc.h: * shell/ev-view.c: (draw_one_page): Clairfy what page the toolbar page number applies to. Fix for the bug #328102.
-rw-r--r--ChangeLog9
-rw-r--r--backend/ev-document-misc.c6
-rw-r--r--backend/ev-document-misc.h3
-rw-r--r--shell/ev-view.c8
4 files changed, 21 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index dbc9b73..e5f25a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-02-24 Ricardo Markiewicz <rmarkie@fi.uba.ar>
+
+ * backend/ev-document-misc.c: (ev_document_misc_paint_one_page):
+ * backend/ev-document-misc.h:
+ * shell/ev-view.c: (draw_one_page):
+
+ Clairfy what page the toolbar page number applies to. Fix
+ for the bug #328102.
+
2006-02-24 Stanislav Slusny <slusnys@gmail.com>
* shell/ev-view-private.h:
diff --git a/backend/ev-document-misc.c b/backend/ev-document-misc.c
index c1fb32c..fd6f449 100644
--- a/backend/ev-document-misc.c
+++ b/backend/ev-document-misc.c
@@ -105,10 +105,12 @@ void
ev_document_misc_paint_one_page (GdkDrawable *drawable,
GtkWidget *widget,
GdkRectangle *area,
- GtkBorder *border)
+ GtkBorder *border,
+ gboolean highlight)
{
gdk_draw_rectangle (drawable,
- widget->style->black_gc,
+ highlight ?
+ widget->style->text_gc[widget->state] : widget->style->dark_gc[widget->state],
TRUE,
area->x,
area->y,
diff --git a/backend/ev-document-misc.h b/backend/ev-document-misc.h
index a101f70..41f1cae 100644
--- a/backend/ev-document-misc.h
+++ b/backend/ev-document-misc.h
@@ -39,7 +39,8 @@ void ev_document_misc_get_page_border_size (gint page_width,
void ev_document_misc_paint_one_page (GdkDrawable *drawable,
GtkWidget *widget,
GdkRectangle *area,
- GtkBorder *border);
+ GtkBorder *border,
+ gboolean highlight);
G_END_DECLS
diff --git a/shell/ev-view.c b/shell/ev-view.c
index 7e77f2e..e599059 100644
--- a/shell/ev-view.c
+++ b/shell/ev-view.c
@@ -2123,11 +2123,14 @@ draw_one_page (EvView *view,
GdkRectangle overlap;
GdkRectangle real_page_area;
EvViewSelection *selection;
+ gint current_page;
g_assert (view->document);
+
if (! gdk_rectangle_intersect (page_area, expose_area, &overlap))
return;
-
+
+ current_page = ev_page_cache_get_current_page (view->page_cache);
selection = find_selection_for_page (view, page);
ev_page_cache_get_size (view->page_cache,
page, view->rotation,
@@ -2143,7 +2146,8 @@ draw_one_page (EvView *view,
ev_document_misc_paint_one_page (GTK_WIDGET(view)->window,
GTK_WIDGET (view),
- page_area, border);
+ page_area, border,
+ page == current_page);
if (gdk_rectangle_intersect (&real_page_area, expose_area, &overlap)) {
GdkPixbuf *selection_pixbuf = NULL;