From 2e7184f51bfd721f3f066a1d6d5257dc7ca57dfd Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 21 Jul 2006 05:20:13 +0000 Subject: [PATCH] Improve drawing of tabs --- ChangeLog | 3 +++ ChangeLog.pre-2-10 | 3 +++ gtk/gtknotebook.c | 17 +++++++---------- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index f71c7546c9..3f68847bca 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2006-07-21 Matthias Clasen + * gtk/gtknotebook.c (gtk_notebook_paint): Improve drawing + of tabs while reordering. (#348115, Benjamin Otte) + * gtk/gtkiconview.c (gtk_icon_view_destroy): Don't leak the adjustments. (#348094, Chris Wilson) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index f71c7546c9..3f68847bca 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,8 @@ 2006-07-21 Matthias Clasen + * gtk/gtknotebook.c (gtk_notebook_paint): Improve drawing + of tabs while reordering. (#348115, Benjamin Otte) + * gtk/gtkiconview.c (gtk_icon_view_destroy): Don't leak the adjustments. (#348094, Chris Wilson) diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c index 9cd57ccfd2..4bcc88a3a7 100644 --- a/gtk/gtknotebook.c +++ b/gtk/gtknotebook.c @@ -4442,10 +4442,8 @@ gtk_notebook_paint (GtkWidget *widget, if (!NOTEBOOK_IS_TAB_LABEL_PARENT (notebook, notebook->cur_page) || !GTK_WIDGET_MAPPED (notebook->cur_page->tab_label)) { - gtk_paint_box (widget->style, widget->window, - GTK_STATE_NORMAL, GTK_SHADOW_OUT, - area, widget, "notebook", - x, y, width, height); + gap_x = 0; + gap_width = 0; } else { @@ -4472,13 +4470,12 @@ gtk_notebook_paint (GtkWidget *widget, step = STEP_PREV; break; } - - gtk_paint_box_gap (widget->style, widget->window, - GTK_STATE_NORMAL, GTK_SHADOW_OUT, - area, widget, "notebook", - x, y, width, height, - tab_pos, gap_x, gap_width); } + gtk_paint_box_gap (widget->style, widget->window, + GTK_STATE_NORMAL, GTK_SHADOW_OUT, + area, widget, "notebook", + x, y, width, height, + tab_pos, gap_x, gap_width); showarrow = FALSE; children = gtk_notebook_search_page (notebook, NULL, step, TRUE);