Draw line with the current state, not GTK_STATE_NORMAL

Sat Jun 26 17:41:10 2004  Soeren Sandmann  <sandmann@daimi.au.dk>

        * 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
This commit is contained in:
Soeren Sandmann 2004-06-27 01:13:13 +00:00 committed by Søren Sandmann Pedersen
parent f0ef8663b8
commit 8f9fb58487
7 changed files with 33 additions and 4 deletions

View File

@ -1,3 +1,10 @@
Sat Jun 26 17:41:10 2004 Soeren Sandmann <sandmann@daimi.au.dk>
* 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 <sandmann@daimi.au.dk>
* gtk/gtkstyle.c, gtk/gtkrc.c: small color tweak. (#141173)

View File

@ -1,3 +1,10 @@
Sat Jun 26 17:41:10 2004 Soeren Sandmann <sandmann@daimi.au.dk>
* 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 <sandmann@daimi.au.dk>
* gtk/gtkstyle.c, gtk/gtkrc.c: small color tweak. (#141173)

View File

@ -1,3 +1,10 @@
Sat Jun 26 17:41:10 2004 Soeren Sandmann <sandmann@daimi.au.dk>
* 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 <sandmann@daimi.au.dk>
* gtk/gtkstyle.c, gtk/gtkrc.c: small color tweak. (#141173)

View File

@ -1,3 +1,10 @@
Sat Jun 26 17:41:10 2004 Soeren Sandmann <sandmann@daimi.au.dk>
* 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 <sandmann@daimi.au.dk>
* gtk/gtkstyle.c, gtk/gtkrc.c: small color tweak. (#141173)

View File

@ -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;

View File

@ -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,

View File

@ -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,