AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-06 10:50:08 +00:00
Code Issues Projects Releases Wiki Activity

notebook: Port to draw vfunc

Browse Source
This commit is contained in:
Benjamin Otte 2010-09-07 02:39:44 +02:00
parent 21099d31ed
commit f383e1f183
1 changed files with 47 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
gtk/gtknotebook.c
View File

@ -283,8 +283,8 @@ static void gtk_notebook_size_request (GtkWidget *widget,
GtkRequisition *requisition); GtkRequisition *requisition);
static void gtk_notebook_size_allocate (GtkWidget *widget, static void gtk_notebook_size_allocate (GtkWidget *widget,
GtkAllocation *allocation); GtkAllocation *allocation);
static gint gtk_notebook_expose (GtkWidget *widget, static gint gtk_notebook_draw (GtkWidget *widget,
GdkEventExpose *event); cairo_t *cr);
static gint gtk_notebook_button_press (GtkWidget *widget, static gint gtk_notebook_button_press (GtkWidget *widget,
GdkEventButton *event); GdkEventButton *event);
static gint gtk_notebook_button_release (GtkWidget *widget, static gint gtk_notebook_button_release (GtkWidget *widget,
@ -401,7 +401,7 @@ static void gtk_notebook_child_reordered (GtkNotebook *notebook,
/*** GtkNotebook Drawing Functions ***/ /*** GtkNotebook Drawing Functions ***/
static void gtk_notebook_paint (GtkWidget *widget, static void gtk_notebook_paint (GtkWidget *widget,
GdkRectangle *area); cairo_t *cr);
static void gtk_notebook_draw_tab (GtkNotebook *notebook, static void gtk_notebook_draw_tab (GtkNotebook *notebook,
GtkNotebookPage *page, GtkNotebookPage *page,
cairo_t *cr); cairo_t *cr);
@ -553,7 +553,7 @@ gtk_notebook_class_init (GtkNotebookClass *class)
widget_class->unrealize = gtk_notebook_unrealize; widget_class->unrealize = gtk_notebook_unrealize;
widget_class->size_request = gtk_notebook_size_request; widget_class->size_request = gtk_notebook_size_request;
widget_class->size_allocate = gtk_notebook_size_allocate; widget_class->size_allocate = gtk_notebook_size_allocate;
widget_class->expose_event = gtk_notebook_expose; widget_class->draw = gtk_notebook_draw;
widget_class->button_press_event = gtk_notebook_button_press; widget_class->button_press_event = gtk_notebook_button_press;
widget_class->button_release_event = gtk_notebook_button_release; widget_class->button_release_event = gtk_notebook_button_release;
widget_class->popup_menu = gtk_notebook_popup_menu; widget_class->popup_menu = gtk_notebook_popup_menu;
@ -1571,7 +1571,7 @@ gtk_notebook_get_property (GObject *object,
* gtk_notebook_realize * gtk_notebook_realize
* gtk_notebook_size_request * gtk_notebook_size_request
* gtk_notebook_size_allocate * gtk_notebook_size_allocate
* gtk_notebook_expose * gtk_notebook_draw
* gtk_notebook_scroll * gtk_notebook_scroll
* gtk_notebook_button_press * gtk_notebook_button_press
* gtk_notebook_button_release * gtk_notebook_button_release
@ -2243,16 +2243,27 @@ gtk_notebook_size_allocate (GtkWidget *widget,
} }
static gint static gint
gtk_notebook_expose (GtkWidget *widget, gtk_notebook_draw (GtkWidget *widget,
GdkEventExpose *event) cairo_t *cr)
{ {
GtkNotebook *notebook = GTK_NOTEBOOK (widget); GtkNotebook *notebook = GTK_NOTEBOOK (widget);
GtkNotebookPrivate *priv = notebook->priv; GtkNotebookPrivate *priv = notebook->priv;
GtkAllocation allocation;
GdkWindow *window;
gint i; gint i;
if (gtk_widget_is_drawable (widget)) gtk_widget_get_allocation (widget, &allocation);
window = gtk_widget_get_window (widget);
if (gtk_cairo_should_draw_window (cr, window))
{ {
gtk_notebook_paint (widget, &event->area); cairo_save (cr);
cairo_translate (cr, -allocation.x, -allocation.y);
gtk_notebook_paint (widget, cr);
cairo_restore (cr);
if (priv->show_tabs) if (priv->show_tabs)
{ {
GtkNotebookPage *page; GtkNotebookPage *page;
@ -2262,32 +2273,31 @@ gtk_notebook_expose (GtkWidget *widget,
{ {
page = GTK_NOTEBOOK_PAGE (pages); page = GTK_NOTEBOOK_PAGE (pages);
if (gtk_widget_get_window (page->tab_label) == event->window && if (gtk_widget_get_parent (page->tab_label) == widget)
gtk_widget_is_drawable (page->tab_label)) gtk_container_propagate_draw (GTK_CONTAINER (notebook),
gtk_container_propagate_expose (GTK_CONTAINER (notebook), page->tab_label, cr);
page->tab_label, event);
} }
} }
if (priv->cur_page) if (priv->cur_page && priv->operation != DRAG_OPERATION_REORDER)
gtk_container_propagate_expose (GTK_CONTAINER (notebook), gtk_container_propagate_draw (GTK_CONTAINER (notebook),
priv->cur_page->child, priv->cur_page->child,
event); cr);
if (priv->show_tabs) if (priv->show_tabs)
{ {
for (i = 0; i < N_ACTION_WIDGETS; i++) for (i = 0; i < N_ACTION_WIDGETS; i++)
{ {
if (priv->action_widget[i] && if (priv->action_widget[i])
gtk_widget_is_drawable (priv->action_widget[i])) gtk_container_propagate_draw (GTK_CONTAINER (notebook),
gtk_container_propagate_expose (GTK_CONTAINER (notebook), priv->action_widget[i], cr);
priv->action_widget[i], event);
} }
} }
} }
if (event->window == priv->drag_window) if (priv->operation == DRAG_OPERATION_REORDER &&
gtk_cairo_should_draw_window (cr, priv->drag_window))
{ {
cairo_t *cr; int x, y;
/* FIXME: This is a workaround to make tabs reordering work better /* FIXME: This is a workaround to make tabs reordering work better
* with engines with rounded tabs. If the drag window background * with engines with rounded tabs. If the drag window background
@ -2296,16 +2306,21 @@ gtk_notebook_expose (GtkWidget *widget,
* Ideally, these corners should be made transparent, Either by using * Ideally, these corners should be made transparent, Either by using
* ARGB visuals or shape windows. * ARGB visuals or shape windows.
*/ */
cr = gdk_cairo_create (priv->drag_window); cairo_save (cr);
gdk_window_get_position (priv->drag_window, &x, &y);
cairo_translate (cr, x - allocation.x, y - allocation.y);
gdk_cairo_set_source_color (cr, &gtk_widget_get_style (widget)->bg [GTK_STATE_NORMAL]); gdk_cairo_set_source_color (cr, &gtk_widget_get_style (widget)->bg [GTK_STATE_NORMAL]);
cairo_paint (cr); cairo_paint (cr);
gtk_notebook_draw_tab (notebook, gtk_notebook_draw_tab (notebook,
priv->cur_page, priv->cur_page,
cr); cr);
cairo_destroy (cr);
gtk_container_propagate_expose (GTK_CONTAINER (notebook), cairo_restore (cr);
priv->cur_page->tab_label, event);
gtk_container_propagate_draw (GTK_CONTAINER (notebook),
priv->cur_page->tab_label, cr);
} }
return FALSE; return FALSE;
@ -4735,7 +4750,7 @@ gtk_notebook_search_page (GtkNotebook *notebook,
*/ */
static void static void
gtk_notebook_paint (GtkWidget *widget, gtk_notebook_paint (GtkWidget *widget,
GdkRectangle *area) cairo_t *cr)
{ {
GtkNotebook *notebook; GtkNotebook *notebook;
GtkNotebookPrivate *priv; GtkNotebookPrivate *priv;
@ -4749,7 +4764,6 @@ gtk_notebook_paint (GtkWidget *widget,
gint gap_x = 0, gap_width = 0, step = STEP_PREV; gint gap_x = 0, gap_width = 0, step = STEP_PREV;
gboolean is_rtl; gboolean is_rtl;
gint tab_pos; gint tab_pos;
cairo_t *cr;
notebook = GTK_NOTEBOOK (widget); notebook = GTK_NOTEBOOK (widget);
priv = notebook->priv; priv = notebook->priv;
@ -4769,10 +4783,9 @@ gtk_notebook_paint (GtkWidget *widget,
if (priv->show_border && (!priv->show_tabs || !priv->children)) if (priv->show_border && (!priv->show_tabs || !priv->children))
{ {
gtk_paint_box (gtk_widget_get_style (widget), gtk_cairo_paint_box (gtk_widget_get_style (widget), cr,
gtk_widget_get_window (widget),
GTK_STATE_NORMAL, GTK_SHADOW_OUT, GTK_STATE_NORMAL, GTK_SHADOW_OUT,
area, widget, "notebook", widget, "notebook",
x, y, width, height); x, y, width, height);
return; return;
} }
@ -4833,17 +4846,12 @@ gtk_notebook_paint (GtkWidget *widget,
break; break;
} }
} }
gtk_paint_box_gap (gtk_widget_get_style (widget), gtk_cairo_paint_box_gap (gtk_widget_get_style (widget), cr,
gtk_widget_get_window (widget),
GTK_STATE_NORMAL, GTK_SHADOW_OUT, GTK_STATE_NORMAL, GTK_SHADOW_OUT,
area, widget, "notebook", widget, "notebook",
x, y, width, height, x, y, width, height,
tab_pos, gap_x, gap_width); tab_pos, gap_x, gap_width);
cr = gdk_cairo_create (gtk_widget_get_window (widget));
gdk_cairo_rectangle (cr, area);
cairo_clip (cr);
showarrow = FALSE; showarrow = FALSE;
children = gtk_notebook_search_page (notebook, NULL, step, TRUE); children = gtk_notebook_search_page (notebook, NULL, step, TRUE);
while (children) while (children)
@ -4873,8 +4881,6 @@ gtk_notebook_paint (GtkWidget *widget,
if (priv->operation != DRAG_OPERATION_REORDER) if (priv->operation != DRAG_OPERATION_REORDER)
gtk_notebook_draw_tab (notebook, priv->cur_page, cr); gtk_notebook_draw_tab (notebook, priv->cur_page, cr);
cairo_destroy (cr);
} }
static void static void