From 8f9fb58487060898c085323be4456a0f4edcf88a Mon Sep 17 00:00:00 2001 From: Soeren Sandmann Date: Sun, 27 Jun 2004 01:13:13 +0000 Subject: [PATCH] Draw line with the current state, not GTK_STATE_NORMAL Sat Jun 26 17:41:10 2004 Soeren Sandmann * gtk/gtk[hv]separator.c (gtk_[hv]separator_expose): Draw line with the current state, not GTK_STATE_NORMAL * gtk/gtkframe.c (gtk_frame_paint): Fix a rounding error --- ChangeLog | 7 +++++++ ChangeLog.pre-2-10 | 7 +++++++ ChangeLog.pre-2-6 | 7 +++++++ ChangeLog.pre-2-8 | 7 +++++++ gtk/gtkframe.c | 5 +++-- gtk/gtkhseparator.c | 2 +- gtk/gtkvseparator.c | 2 +- 7 files changed, 33 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6019f0ef23..4a4172357d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Sat Jun 26 17:41:10 2004 Soeren Sandmann + + * gtk/gtk[hv]separator.c (gtk_[hv]separator_expose): Draw line with the + current state, not GTK_STATE_NORMAL + + * gtk/gtkframe.c (gtk_frame_paint): Fix a rounding error + Sat Jun 26 15:07:25 2004 Soeren Sandmann * gtk/gtkstyle.c, gtk/gtkrc.c: small color tweak. (#141173) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 6019f0ef23..4a4172357d 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +Sat Jun 26 17:41:10 2004 Soeren Sandmann + + * gtk/gtk[hv]separator.c (gtk_[hv]separator_expose): Draw line with the + current state, not GTK_STATE_NORMAL + + * gtk/gtkframe.c (gtk_frame_paint): Fix a rounding error + Sat Jun 26 15:07:25 2004 Soeren Sandmann * gtk/gtkstyle.c, gtk/gtkrc.c: small color tweak. (#141173) diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 6019f0ef23..4a4172357d 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +Sat Jun 26 17:41:10 2004 Soeren Sandmann + + * gtk/gtk[hv]separator.c (gtk_[hv]separator_expose): Draw line with the + current state, not GTK_STATE_NORMAL + + * gtk/gtkframe.c (gtk_frame_paint): Fix a rounding error + Sat Jun 26 15:07:25 2004 Soeren Sandmann * gtk/gtkstyle.c, gtk/gtkrc.c: small color tweak. (#141173) diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 6019f0ef23..4a4172357d 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +Sat Jun 26 17:41:10 2004 Soeren Sandmann + + * gtk/gtk[hv]separator.c (gtk_[hv]separator_expose): Draw line with the + current state, not GTK_STATE_NORMAL + + * gtk/gtkframe.c (gtk_frame_paint): Fix a rounding error + Sat Jun 26 15:07:25 2004 Soeren Sandmann * gtk/gtkstyle.c, gtk/gtkrc.c: small color tweak. (#141173) diff --git a/gtk/gtkframe.c b/gtk/gtkframe.c index 02a59c55f4..8cd7340ac3 100644 --- a/gtk/gtkframe.c +++ b/gtk/gtkframe.c @@ -557,8 +557,9 @@ gtk_frame_paint (GtkWidget *widget, xalign = 1 - frame->label_xalign; height_extra = MAX (0, child_requisition.height - widget->style->ythickness); - y -= height_extra * (1 - frame->label_yalign); - height += height_extra * (1 - frame->label_yalign); + height_extra *= (1 - frame->label_yalign); + y -= height_extra; + height += height_extra; x2 = widget->style->xthickness + (frame->child_allocation.width - child_requisition.width - 2 * LABEL_PAD - 2 * LABEL_SIDE_PAD) * xalign + LABEL_SIDE_PAD; diff --git a/gtk/gtkhseparator.c b/gtk/gtkhseparator.c index d752127412..a082c15c9c 100644 --- a/gtk/gtkhseparator.c +++ b/gtk/gtkhseparator.c @@ -91,7 +91,7 @@ gtk_hseparator_expose (GtkWidget *widget, GdkEventExpose *event) { if (GTK_WIDGET_DRAWABLE (widget)) - gtk_paint_hline (widget->style, widget->window, GTK_STATE_NORMAL, + gtk_paint_hline (widget->style, widget->window, GTK_WIDGET_STATE (widget), &event->area, widget, "hseparator", widget->allocation.x, widget->allocation.x + widget->allocation.width - 1, diff --git a/gtk/gtkvseparator.c b/gtk/gtkvseparator.c index 872fd54a8e..f4cfe6729c 100644 --- a/gtk/gtkvseparator.c +++ b/gtk/gtkvseparator.c @@ -91,7 +91,7 @@ gtk_vseparator_expose (GtkWidget *widget, GdkEventExpose *event) { if (GTK_WIDGET_DRAWABLE (widget)) - gtk_paint_vline (widget->style, widget->window, GTK_STATE_NORMAL, + gtk_paint_vline (widget->style, widget->window, GTK_WIDGET_STATE (widget), &event->area, widget, "vseparator", widget->allocation.y, widget->allocation.y + widget->allocation.height - 1,