AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

viewport: Port to draw vfunc

Browse Source
This commit is contained in:
Benjamin Otte 2010-09-07 16:56:46 +02:00
parent 4a23b12911
commit bf8df2daea
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
gtk/gtkviewport.c
View File

@ -87,8 +87,8 @@ static void gtk_viewport_set_scroll_adjustments (GtkViewport *viewport,
GtkAdjustment *vadjustment); GtkAdjustment *vadjustment);
static void gtk_viewport_realize (GtkWidget *widget); static void gtk_viewport_realize (GtkWidget *widget);
static void gtk_viewport_unrealize (GtkWidget *widget); static void gtk_viewport_unrealize (GtkWidget *widget);
static gint gtk_viewport_expose (GtkWidget *widget, static gint gtk_viewport_draw (GtkWidget *widget,
GdkEventExpose *event); cairo_t *cr);
static void gtk_viewport_add (GtkContainer *container, static void gtk_viewport_add (GtkContainer *container,
GtkWidget *widget); GtkWidget *widget);
static void gtk_viewport_size_allocate (GtkWidget *widget, static void gtk_viewport_size_allocate (GtkWidget *widget,
@ -131,7 +131,7 @@ gtk_viewport_class_init (GtkViewportClass *class)
widget_class->realize = gtk_viewport_realize; widget_class->realize = gtk_viewport_realize;
widget_class->unrealize = gtk_viewport_unrealize; widget_class->unrealize = gtk_viewport_unrealize;
widget_class->expose_event = gtk_viewport_expose; widget_class->draw = gtk_viewport_draw;
widget_class->size_allocate = gtk_viewport_size_allocate; widget_class->size_allocate = gtk_viewport_size_allocate;
widget_class->style_set = gtk_viewport_style_set; widget_class->style_set = gtk_viewport_style_set;
@ -770,36 +770,36 @@ gtk_viewport_unrealize (GtkWidget *widget)
} }
static gint static gint
gtk_viewport_expose (GtkWidget *widget, gtk_viewport_draw (GtkWidget *widget,
GdkEventExpose *event) cairo_t *cr)
{ {
if (gtk_widget_is_drawable (widget)) if (gtk_widget_is_drawable (widget))
{ {
GtkViewport *viewport = GTK_VIEWPORT (widget); GtkViewport *viewport = GTK_VIEWPORT (widget);
GtkViewportPrivate *priv = viewport->priv; GtkViewportPrivate *priv = viewport->priv;
int width, height; int x, y, w, h;
if (event->window == gtk_widget_get_window (widget)) if (gtk_cairo_should_draw_window (cr, gtk_widget_get_window (widget)))
{ {
gdk_drawable_get_size (gtk_widget_get_window (widget), gdk_drawable_get_size (gtk_widget_get_window (widget),
&width, &height); &w, &h);
gtk_paint_shadow (gtk_widget_get_style (widget), gtk_cairo_paint_shadow (gtk_widget_get_style (widget),
gtk_widget_get_window (widget), cr,
GTK_STATE_NORMAL, priv->shadow_type, GTK_STATE_NORMAL, priv->shadow_type,
&event->area, widget, "viewport", widget, "viewport",
0, 0, width, height); 0, 0, w, h);
} }
if (event->window == priv->bin_window) if (gtk_cairo_should_draw_window (cr, priv->bin_window))
{ {
gdk_drawable_get_size (priv->bin_window, gdk_window_get_position (priv->bin_window, &x, &y);
&width, &height); gdk_drawable_get_size (priv->bin_window, &w, &h);
gtk_paint_flat_box(gtk_widget_get_style (widget), priv->bin_window, gtk_cairo_paint_flat_box (gtk_widget_get_style (widget), cr,
GTK_STATE_NORMAL, GTK_SHADOW_NONE, GTK_STATE_NORMAL, GTK_SHADOW_NONE,
&event->area, widget, "viewportbin", widget, "viewportbin",
0, 0, width, height); x, y, w, h);
GTK_WIDGET_CLASS (gtk_viewport_parent_class)->expose_event (widget, event); GTK_WIDGET_CLASS (gtk_viewport_parent_class)->draw (widget, cr);
} }
} }