callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid some unnecessary gtk_widget_get_style() calls.

Browse Source 
2007-01-27  Matthias Clasen  <mclasen@redhat.com>

        * gtk/gtknotebook.c (gtk_notebook_draw_arrow):
        (gtk_notebook_draw_focus): Avoid some unnecessary
        gtk_widget_get_style() calls.



svn path=/trunk/; revision=17229
This commit is contained in:
Matthias Clasen
2007-01-28 04:41:52 +00:00
committed by Matthias Clasen
parent f560d06dd5
commit 85832deef3
2 changed files with 30 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2007-01-27 Matthias Clasen <mclasen@redhat.com>
* gtk/gtknotebook.c (gtk_notebook_draw_arrow):
(gtk_notebook_draw_focus): Avoid some unnecessary
gtk_widget_get_style() calls.
2007-01-27 Matthias Clasen <mclasen@redhat.com> 2007-01-27 Matthias Clasen <mclasen@redhat.com>
* gtk/gtktoolbar.c: * gtk/gtktoolbar.c:

45
gtk/gtknotebook.c
View File

@ -1688,7 +1688,7 @@ gtk_notebook_size_request (GtkWidget *widget,
gint scroll_arrow_vlength; gint scroll_arrow_vlength;
gtk_widget_style_get (widget, gtk_widget_style_get (widget,
"focus-line-width", &focus_width, "focus-line-width", &focus_width,
"tab-overlap", &tab_overlap, "tab-overlap", &tab_overlap,
"tab-curvature", &tab_curvature, "tab-curvature", &tab_curvature,
"arrow-spacing", &arrow_spacing, "arrow-spacing", &arrow_spacing,
@ -2996,22 +2996,25 @@ gtk_notebook_draw_focus (GtkWidget *widget,
notebook->cur_page->tab_label->window == event->window) notebook->cur_page->tab_label->window == event->window)
{ {
GtkNotebookPage *page; GtkNotebookPage *page;
GdkRectangle area;
gint focus_width;
gtk_widget_style_get (widget, "focus-line-width", &focus_width, NULL);
page = notebook->cur_page; page = notebook->cur_page;
area.x = page->tab_label->allocation.x - focus_width;
area.y = page->tab_label->allocation.y - focus_width;
area.width = page->tab_label->allocation.width + 2 * focus_width;
area.height = page->tab_label->allocation.height + 2 * focus_width;
if (gtk_widget_intersect (page->tab_label, &event->area, NULL)) if (gtk_widget_intersect (page->tab_label, &event->area, NULL))
gtk_paint_focus (widget->style, event->window, GTK_WIDGET_STATE (widget), {
NULL, widget, "tab", GdkRectangle area;
area.x, area.y, area.width, area.height); gint focus_width;
gtk_widget_style_get (widget, "focus-line-width", &focus_width, NULL);
area.x = page->tab_label->allocation.x - focus_width;
area.y = page->tab_label->allocation.y - focus_width;
area.width = page->tab_label->allocation.width + 2 * focus_width;
area.height = page->tab_label->allocation.height + 2 * focus_width;
gtk_paint_focus (widget->style, event->window,
GTK_WIDGET_STATE (widget), NULL, widget, "tab",
area.x, area.y, area.width, area.height);
}
} }
} }
@ -4626,20 +4629,20 @@ gtk_notebook_draw_arrow (GtkNotebook *notebook,
GtkArrowType arrow; GtkArrowType arrow;
gboolean is_rtl, left; gboolean is_rtl, left;
gtk_notebook_get_arrow_rect (notebook, &arrow_rect, nbarrow);
widget = GTK_WIDGET (notebook);
is_rtl = gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL;
left = (ARROW_IS_LEFT (nbarrow) && !is_rtl) ||
(!ARROW_IS_LEFT (nbarrow) && is_rtl);
if (GTK_WIDGET_DRAWABLE (notebook)) if (GTK_WIDGET_DRAWABLE (notebook))
{ {
gint scroll_arrow_hlength; gint scroll_arrow_hlength;
gint scroll_arrow_vlength; gint scroll_arrow_vlength;
gint arrow_size; gint arrow_size;
gtk_notebook_get_arrow_rect (notebook, &arrow_rect, nbarrow);
widget = GTK_WIDGET (notebook);
is_rtl = gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL;
left = (ARROW_IS_LEFT (nbarrow) && !is_rtl) ||
(!ARROW_IS_LEFT (nbarrow) && is_rtl);
gtk_widget_style_get (widget, gtk_widget_style_get (widget,
"scroll-arrow-hlength", &scroll_arrow_hlength, "scroll-arrow-hlength", &scroll_arrow_hlength,
"scroll-arrow-vlength", &scroll_arrow_vlength, "scroll-arrow-vlength", &scroll_arrow_vlength,