Fix a typo where gtkrc.vi_VN.tcvn5712 wasn't getting deleted, causing
Thu Oct 7 11:09:55 1999 Owen Taylor <otaylor@redhat.com> * gtk/Makefile.am (install-data-local): Fix a typo where gtkrc.vi_VN.tcvn5712 wasn't getting deleted, causing error messages on install. Thu Oct 7 11:03:06 1999 Owen Taylor <otaylor@redhat.com> * gtk/gtk[hv]paned.c (gtk_{h,v}paned_draw): Redraw the handle as well, since we now sometimes ignore exposes on the handle while resizing.
This commit is contained in:
12
ChangeLog
12
ChangeLog
@@ -1,3 +1,15 @@
|
||||
Thu Oct 7 11:09:55 1999 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/Makefile.am (install-data-local): Fix
|
||||
a typo where gtkrc.vi_VN.tcvn5712 wasn't getting
|
||||
deleted, causing error messages on install.
|
||||
|
||||
Thu Oct 7 11:03:06 1999 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtk[hv]paned.c (gtk_{h,v}paned_draw): Redraw
|
||||
the handle as well, since we now sometimes ignore
|
||||
exposes on the handle while resizing.
|
||||
|
||||
Wed Oct 6 18:02:31 1999 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtkrc.c (gtk_rc_append_default_pixmap_path): Fix stupid
|
||||
|
||||
@@ -1,3 +1,15 @@
|
||||
Thu Oct 7 11:09:55 1999 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/Makefile.am (install-data-local): Fix
|
||||
a typo where gtkrc.vi_VN.tcvn5712 wasn't getting
|
||||
deleted, causing error messages on install.
|
||||
|
||||
Thu Oct 7 11:03:06 1999 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtk[hv]paned.c (gtk_{h,v}paned_draw): Redraw
|
||||
the handle as well, since we now sometimes ignore
|
||||
exposes on the handle while resizing.
|
||||
|
||||
Wed Oct 6 18:02:31 1999 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtkrc.c (gtk_rc_append_default_pixmap_path): Fix stupid
|
||||
|
||||
@@ -1,3 +1,15 @@
|
||||
Thu Oct 7 11:09:55 1999 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/Makefile.am (install-data-local): Fix
|
||||
a typo where gtkrc.vi_VN.tcvn5712 wasn't getting
|
||||
deleted, causing error messages on install.
|
||||
|
||||
Thu Oct 7 11:03:06 1999 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtk[hv]paned.c (gtk_{h,v}paned_draw): Redraw
|
||||
the handle as well, since we now sometimes ignore
|
||||
exposes on the handle while resizing.
|
||||
|
||||
Wed Oct 6 18:02:31 1999 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtkrc.c (gtk_rc_append_default_pixmap_path): Fix stupid
|
||||
|
||||
@@ -1,3 +1,15 @@
|
||||
Thu Oct 7 11:09:55 1999 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/Makefile.am (install-data-local): Fix
|
||||
a typo where gtkrc.vi_VN.tcvn5712 wasn't getting
|
||||
deleted, causing error messages on install.
|
||||
|
||||
Thu Oct 7 11:03:06 1999 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtk[hv]paned.c (gtk_{h,v}paned_draw): Redraw
|
||||
the handle as well, since we now sometimes ignore
|
||||
exposes on the handle while resizing.
|
||||
|
||||
Wed Oct 6 18:02:31 1999 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtkrc.c (gtk_rc_append_default_pixmap_path): Fix stupid
|
||||
|
||||
@@ -1,3 +1,15 @@
|
||||
Thu Oct 7 11:09:55 1999 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/Makefile.am (install-data-local): Fix
|
||||
a typo where gtkrc.vi_VN.tcvn5712 wasn't getting
|
||||
deleted, causing error messages on install.
|
||||
|
||||
Thu Oct 7 11:03:06 1999 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtk[hv]paned.c (gtk_{h,v}paned_draw): Redraw
|
||||
the handle as well, since we now sometimes ignore
|
||||
exposes on the handle while resizing.
|
||||
|
||||
Wed Oct 6 18:02:31 1999 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtkrc.c (gtk_rc_append_default_pixmap_path): Fix stupid
|
||||
|
||||
@@ -1,3 +1,15 @@
|
||||
Thu Oct 7 11:09:55 1999 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/Makefile.am (install-data-local): Fix
|
||||
a typo where gtkrc.vi_VN.tcvn5712 wasn't getting
|
||||
deleted, causing error messages on install.
|
||||
|
||||
Thu Oct 7 11:03:06 1999 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtk[hv]paned.c (gtk_{h,v}paned_draw): Redraw
|
||||
the handle as well, since we now sometimes ignore
|
||||
exposes on the handle while resizing.
|
||||
|
||||
Wed Oct 6 18:02:31 1999 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtkrc.c (gtk_rc_append_default_pixmap_path): Fix stupid
|
||||
|
||||
@@ -1,3 +1,15 @@
|
||||
Thu Oct 7 11:09:55 1999 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/Makefile.am (install-data-local): Fix
|
||||
a typo where gtkrc.vi_VN.tcvn5712 wasn't getting
|
||||
deleted, causing error messages on install.
|
||||
|
||||
Thu Oct 7 11:03:06 1999 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtk[hv]paned.c (gtk_{h,v}paned_draw): Redraw
|
||||
the handle as well, since we now sometimes ignore
|
||||
exposes on the handle while resizing.
|
||||
|
||||
Wed Oct 6 18:02:31 1999 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtkrc.c (gtk_rc_append_default_pixmap_path): Fix stupid
|
||||
|
||||
@@ -393,7 +393,7 @@ install-data-local:
|
||||
ln -s gtkrc.iso-8859-5 gtkrc.$$i ; \
|
||||
done ; \
|
||||
rm -f gtkrc.lt gtkrc.cy gtkrc.ga gtkrc.et gtkrc.ka \
|
||||
gtkrc.vi_VN.viscii111 vi_VN.tcvn5712 gtkrc.vi ; \
|
||||
gtkrc.vi_VN.viscii111 gtkrc.vi_VN.tcvn5712 gtkrc.vi ; \
|
||||
ln -s gtkrc.iso-8859-13 gtkrc.lt ; \
|
||||
ln -s gtkrc.iso-8859-14 gtkrc.cy ; \
|
||||
ln -s gtkrc.iso-8859-14 gtkrc.ga ; \
|
||||
|
||||
@@ -245,7 +245,7 @@ gtk_hpaned_draw (GtkWidget *widget,
|
||||
GdkRectangle *area)
|
||||
{
|
||||
GtkPaned *paned;
|
||||
GdkRectangle child_area;
|
||||
GdkRectangle handle_area, child_area;
|
||||
guint16 border_width;
|
||||
|
||||
g_return_if_fail (widget != NULL);
|
||||
@@ -253,11 +253,43 @@ gtk_hpaned_draw (GtkWidget *widget,
|
||||
|
||||
if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_MAPPED (widget))
|
||||
{
|
||||
gint width, height;
|
||||
|
||||
paned = GTK_PANED (widget);
|
||||
border_width = GTK_CONTAINER (paned)->border_width;
|
||||
|
||||
gdk_window_clear_area (widget->window,
|
||||
area->x, area->y, area->width, area->height);
|
||||
|
||||
/* Redraw the handle
|
||||
*/
|
||||
gdk_window_get_size (paned->handle, &width, &height);
|
||||
|
||||
handle_area.x = paned->handle_xpos;
|
||||
handle_area.y = paned->handle_ypos;
|
||||
handle_area.width = width;
|
||||
handle_area.height = height;
|
||||
|
||||
if (gdk_rectangle_intersect (&handle_area, area, &child_area))
|
||||
{
|
||||
child_area.x -= handle_area.x;
|
||||
child_area.y -= handle_area.y;
|
||||
gtk_paint_box (widget->style, paned->handle,
|
||||
GTK_WIDGET_STATE(widget),
|
||||
GTK_SHADOW_OUT,
|
||||
&child_area, widget, "paned",
|
||||
0, 0,
|
||||
width, height);
|
||||
}
|
||||
|
||||
/* Redraw the groove
|
||||
*/
|
||||
gtk_paint_vline(widget->style, widget->window, GTK_STATE_NORMAL,
|
||||
area, widget, "hpaned",
|
||||
0, widget->allocation.height - 1,
|
||||
border_width + paned->child1_size + paned->gutter_size / 2 - 1);
|
||||
/* Redraw the children
|
||||
*/
|
||||
if (paned->child1 &&
|
||||
gtk_widget_intersect (paned->child1, area, &child_area))
|
||||
gtk_widget_draw (paned->child1, &child_area);
|
||||
@@ -265,10 +297,6 @@ gtk_hpaned_draw (GtkWidget *widget,
|
||||
gtk_widget_intersect (paned->child2, area, &child_area))
|
||||
gtk_widget_draw (paned->child2, &child_area);
|
||||
|
||||
gtk_paint_vline(widget->style, widget->window, GTK_STATE_NORMAL,
|
||||
area, widget, "hpaned",
|
||||
0, widget->allocation.height - 1,
|
||||
border_width + paned->child1_size + paned->gutter_size / 2 - 1);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -245,7 +245,7 @@ gtk_vpaned_draw (GtkWidget *widget,
|
||||
GdkRectangle *area)
|
||||
{
|
||||
GtkPaned *paned;
|
||||
GdkRectangle child_area;
|
||||
GdkRectangle handle_area, child_area;
|
||||
guint16 border_width;
|
||||
|
||||
g_return_if_fail (widget != NULL);
|
||||
@@ -253,11 +253,44 @@ gtk_vpaned_draw (GtkWidget *widget,
|
||||
|
||||
if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_MAPPED (widget))
|
||||
{
|
||||
gint width, height;
|
||||
|
||||
paned = GTK_PANED (widget);
|
||||
border_width = GTK_CONTAINER (paned)->border_width;
|
||||
|
||||
gdk_window_clear_area (widget->window,
|
||||
area->x, area->y, area->width, area->height);
|
||||
|
||||
/* Redraw the handle
|
||||
*/
|
||||
gdk_window_get_size (paned->handle, &width, &height);
|
||||
|
||||
handle_area.x = paned->handle_xpos;
|
||||
handle_area.y = paned->handle_ypos;
|
||||
handle_area.width = width;
|
||||
handle_area.height = height;
|
||||
|
||||
if (gdk_rectangle_intersect (&handle_area, area, &child_area))
|
||||
{
|
||||
child_area.x -= handle_area.x;
|
||||
child_area.y -= handle_area.y;
|
||||
gtk_paint_box (widget->style, paned->handle,
|
||||
GTK_WIDGET_STATE(widget),
|
||||
GTK_SHADOW_OUT,
|
||||
&child_area, widget, "paned",
|
||||
0, 0,
|
||||
width, height);
|
||||
}
|
||||
|
||||
/* Redraw the groove
|
||||
*/
|
||||
gtk_paint_hline(widget->style, widget->window, GTK_STATE_NORMAL,
|
||||
area, widget, "vpaned",
|
||||
0, widget->allocation.width - 1,
|
||||
border_width + paned->child1_size + paned->gutter_size / 2 - 1);
|
||||
|
||||
/* Redraw the children
|
||||
*/
|
||||
if (paned->child1 &&
|
||||
gtk_widget_intersect (paned->child1, area, &child_area))
|
||||
gtk_widget_draw (paned->child1, &child_area);
|
||||
@@ -265,10 +298,6 @@ gtk_vpaned_draw (GtkWidget *widget,
|
||||
gtk_widget_intersect (paned->child2, area, &child_area))
|
||||
gtk_widget_draw (paned->child2, &child_area);
|
||||
|
||||
gtk_paint_hline(widget->style, widget->window, GTK_STATE_NORMAL,
|
||||
area, widget, "vpaned",
|
||||
0, widget->allocation.width - 1,
|
||||
border_width + paned->child1_size + paned->gutter_size / 2 - 1);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user