summaryrefslogtreecommitdiff
path: root/gtk/gtkpaned.c
diff options
context:
space:
mode:
authorHavoc Pennington <hp@redhat.com>2000-12-04 23:04:17 +0000
committerHavoc Pennington <hp@src.gnome.org>2000-12-04 23:04:17 +0000
commit9365d0d7dc44e67a371590edf7b5f8744963e04c (patch)
tree72f57f594f861aafca4ddc4815b16d1969699ead /gtk/gtkpaned.c
parentd77144614bb39e62dc40cd9b8c510b4cfee04c62 (diff)
downloadgdk-pixbuf-9365d0d7dc44e67a371590edf7b5f8744963e04c.tar.gz
fix this to be sane
2000-12-04 Havoc Pennington <hp@redhat.com> * gtk/gtkpaned.c (gtk_paned_expose): fix this to be sane * gtk/gtkvpaned.c (gtk_vpaned_expose): Add an expose handler * gtk/gtkhpaned.c (gtk_hpaned_expose): Add an expose handler * gtk/gtknotebook.c (gtk_notebook_draw_tab): put in a temporary hack to avoid infinite loops (queue draw instead of draw) - Owen has more appropriate fixes in a branch he'll check in later. * gtk/gtktextiter.c (gtk_text_iter_ends_line): handle paragraph separator, CR, and CRLF as line ends * gtk/gtktextbtree.c (gtk_text_btree_insert): on insertion, break into lines using pango_find_paragraph_boundary(); other bits of the widget are still going to be broken if the boundary isn't '\n' though
Diffstat (limited to 'gtk/gtkpaned.c')
-rw-r--r--gtk/gtkpaned.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/gtk/gtkpaned.c b/gtk/gtkpaned.c
index 87cecc3dd..483084702 100644
--- a/gtk/gtkpaned.c
+++ b/gtk/gtkpaned.c
@@ -295,6 +295,8 @@ gtk_paned_unrealize (GtkWidget *widget)
(* GTK_WIDGET_CLASS (parent_class)->unrealize) (widget);
}
+
+
static gint
gtk_paned_expose (GtkWidget *widget,
GdkEventExpose *event)
@@ -310,16 +312,10 @@ gtk_paned_expose (GtkWidget *widget,
{
paned = GTK_PANED (widget);
- if (event->window == paned->handle)
- {
- child_event = *event;
- event->area.x += paned->handle_xpos;
- event->area.y += paned->handle_ypos;
- gtk_widget_draw (widget, &event->area);
- }
- else
+ if (event->window != paned->handle)
{
child_event = *event;
+
if (paned->child1 &&
GTK_WIDGET_NO_WINDOW (paned->child1) &&
gtk_widget_intersect (paned->child1, &event->area, &child_event.area))