Commit c01a1c73 authored by Havoc Pennington's avatar Havoc Pennington Committed by Havoc Pennington

allow shrinking the image window to test that we clip to allocation.

2001-04-18  Havoc Pennington  <hp@redhat.com>

	* tests/testgtk.c (create_image): allow shrinking the image window
	to test that we clip to allocation.

	* gtk/gtkimage.c (gtk_image_expose): clip to allocation,
	#9845

	* gtk/gtkenums.h: move GtkWrapMode in here, #50472
parent 6cff7051
2001-04-18 Havoc Pennington <hp@redhat.com>
* tests/testgtk.c (create_image): allow shrinking the image window
to test that we clip to allocation.
* gtk/gtkimage.c (gtk_image_expose): clip to allocation,
#9845
* gtk/gtkenums.h: move GtkWrapMode in here, #50472
Wed Apr 18 14:23:14 2001 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkimage-x11.c (gdk_image_new): Try changing
......
2001-04-18 Havoc Pennington <hp@redhat.com>
* tests/testgtk.c (create_image): allow shrinking the image window
to test that we clip to allocation.
* gtk/gtkimage.c (gtk_image_expose): clip to allocation,
#9845
* gtk/gtkenums.h: move GtkWrapMode in here, #50472
Wed Apr 18 14:23:14 2001 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkimage-x11.c (gdk_image_new): Try changing
......
2001-04-18 Havoc Pennington <hp@redhat.com>
* tests/testgtk.c (create_image): allow shrinking the image window
to test that we clip to allocation.
* gtk/gtkimage.c (gtk_image_expose): clip to allocation,
#9845
* gtk/gtkenums.h: move GtkWrapMode in here, #50472
Wed Apr 18 14:23:14 2001 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkimage-x11.c (gdk_image_new): Try changing
......
2001-04-18 Havoc Pennington <hp@redhat.com>
* tests/testgtk.c (create_image): allow shrinking the image window
to test that we clip to allocation.
* gtk/gtkimage.c (gtk_image_expose): clip to allocation,
#9845
* gtk/gtkenums.h: move GtkWrapMode in here, #50472
Wed Apr 18 14:23:14 2001 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkimage-x11.c (gdk_image_new): Try changing
......
2001-04-18 Havoc Pennington <hp@redhat.com>
* tests/testgtk.c (create_image): allow shrinking the image window
to test that we clip to allocation.
* gtk/gtkimage.c (gtk_image_expose): clip to allocation,
#9845
* gtk/gtkenums.h: move GtkWrapMode in here, #50472
Wed Apr 18 14:23:14 2001 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkimage-x11.c (gdk_image_new): Try changing
......
2001-04-18 Havoc Pennington <hp@redhat.com>
* tests/testgtk.c (create_image): allow shrinking the image window
to test that we clip to allocation.
* gtk/gtkimage.c (gtk_image_expose): clip to allocation,
#9845
* gtk/gtkenums.h: move GtkWrapMode in here, #50472
Wed Apr 18 14:23:14 2001 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkimage-x11.c (gdk_image_new): Try changing
......
2001-04-18 Havoc Pennington <hp@redhat.com>
* tests/testgtk.c (create_image): allow shrinking the image window
to test that we clip to allocation.
* gtk/gtkimage.c (gtk_image_expose): clip to allocation,
#9845
* gtk/gtkenums.h: move GtkWrapMode in here, #50472
Wed Apr 18 14:23:14 2001 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkimage-x11.c (gdk_image_new): Try changing
......
......@@ -363,6 +363,14 @@ typedef enum
GTK_WINDOW_POPUP
} GtkWindowType;
/* Text wrap */
typedef enum
{
GTK_WRAP_NONE,
GTK_WRAP_CHAR,
GTK_WRAP_WORD
} GtkWrapMode;
/* How to sort */
typedef enum
{
......
......@@ -790,9 +790,9 @@ gtk_image_expose (GtkWidget *widget,
area = event->area;
if (gdk_rectangle_intersect (&image_bound, &area, &intersection))
if (gdk_rectangle_intersect (&area, &widget->allocation, &area) &&
gdk_rectangle_intersect (&image_bound, &area, &image_bound))
{
switch (image->storage_type)
{
case GTK_IMAGE_PIXMAP:
......
......@@ -12,13 +12,6 @@ typedef struct _GtkTextIter GtkTextIter;
typedef struct _GtkTextBTreeNode GtkTextBTreeNode;
typedef struct _GtkTextTagTable GtkTextTagTable;
typedef enum
{
GTK_WRAP_NONE,
GTK_WRAP_CHAR,
GTK_WRAP_WORD
} GtkWrapMode;
typedef struct _GtkTextAttributes GtkTextAttributes;
#define GTK_TYPE_TEXT_TAG (gtk_text_tag_get_type ())
......
......@@ -2758,6 +2758,10 @@ create_image (void)
GdkBitmap *mask;
window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
/* this is bogus for testing drawing when allocation < request,
* don't copy into real code
*/
gtk_window_set_policy (GTK_WINDOW (window), TRUE, TRUE, FALSE);
gtk_signal_connect (GTK_OBJECT (window), "destroy",
GTK_SIGNAL_FUNC(gtk_widget_destroyed),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment