projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Simplify expose callback
[pspp-builds.git]
/
lib
/
gtksheet
/
gtksheet.c
diff --git
a/lib/gtksheet/gtksheet.c
b/lib/gtksheet/gtksheet.c
index 246e2d77d8f87753e0af674d85eebea671c5d3c7..3ee0aa83db0b1dca6db1a510036b538edcc57c69 100644
(file)
--- a/
lib/gtksheet/gtksheet.c
+++ b/
lib/gtksheet/gtksheet.c
@@
-3075,33
+3075,31
@@
gtk_sheet_expose (GtkWidget *widget,
max_visible_column (sheet));
}
max_visible_column (sheet));
}
+ if (event->window == sheet->sheet_window)
+ {
+ gint y = event->area.y + sheet->vadjustment->value;
+ gint x = event->area.x + sheet->hadjustment->value;
- {
- gint y = event->area.y + sheet->vadjustment->value;
- gint x = event->area.x + sheet->hadjustment->value;
-
- if ( sheet->column_titles_visible)
- y -= sheet->column_title_area.height;
+ if ( sheet->column_titles_visible)
+ y -= sheet->column_title_area.height;
- if ( sheet->row_titles_visible)
- x -= sheet->row_title_area.width;
+
if ( sheet->row_titles_visible)
+
x -= sheet->row_title_area.width;
- maximize_int (&x, 0);
- maximize_int (&y, 0);
+
maximize_int (&x, 0);
+
maximize_int (&y, 0);
- range.row0 = row_from_ypixel (sheet, y);
+
range.row0 = row_from_ypixel (sheet, y);
- range.rowi = row_from_ypixel (sheet, y + event->area.height);
+
range.rowi = row_from_ypixel (sheet, y + event->area.height);
- range.col0 = column_from_xpixel (sheet, x);
+
range.col0 = column_from_xpixel (sheet, x);
- range.coli = column_from_xpixel (sheet, x + event->area.width);
- }
+ range.coli = column_from_xpixel (sheet, x + event->area.width);
- if (event->window == sheet->sheet_window)
- {
gtk_sheet_range_draw (sheet, &range);
gtk_sheet_range_draw (sheet, &range);
+#if 0
if (sheet->state != GTK_SHEET_NORMAL)
{
if (gtk_sheet_range_isvisible (sheet, &sheet->range))
if (sheet->state != GTK_SHEET_NORMAL)
{
if (gtk_sheet_range_isvisible (sheet, &sheet->range))
@@
-3115,7
+3113,7
@@
gtk_sheet_expose (GtkWidget *widget,
if (GTK_SHEET_IN_RESIZE (sheet) || GTK_SHEET_IN_DRAG (sheet))
draw_xor_rectangle (sheet, sheet->drag_range);
}
if (GTK_SHEET_IN_RESIZE (sheet) || GTK_SHEET_IN_DRAG (sheet))
draw_xor_rectangle (sheet, sheet->drag_range);
}
-
+#endif
}
(* GTK_WIDGET_CLASS (parent_class)->expose_event) (widget, event);
}
(* GTK_WIDGET_CLASS (parent_class)->expose_event) (widget, event);