callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

derive from GtkWidget instead of GtkDrawingArea so we save a GdkWindow and

Browse Source 
2007-05-28  Michael Natterer  <mitch@gimp.org>

	* app/widgets/gimpfgbgview.[ch]: derive from GtkWidget instead of
	GtkDrawingArea so we save a GdkWindow and render on the correct
	background color also for inactive notebook tabs.


svn path=/trunk/; revision=22641
This commit is contained in:
Michael Natterer
2007-05-28 14:08:15 +00:00
committed by Michael Natterer
parent 0530f9f09d
commit 53f70a7eea
3 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2007-05-28 Michael Natterer <mitch@gimp.org>
* app/widgets/gimpfgbgview.[ch]: derive from GtkWidget instead of
GtkDrawingArea so we save a GdkWindow and render on the correct
background color also for inactive notebook tabs.
2007-05-28 Michael Natterer <mitch@gimp.org> 2007-05-28 Michael Natterer <mitch@gimp.org>
* app/core/gimplayer-floating-sel.c (floating_sel_attach): set * app/core/gimplayer-floating-sel.c (floating_sel_attach): set

18
app/widgets/gimpfgbgview.c
View File

@ -58,7 +58,7 @@ static gboolean gimp_fg_bg_view_expose (GtkWidget *widget,
GdkEventExpose *eevent); GdkEventExpose *eevent);
G_DEFINE_TYPE (GimpFgBgView, gimp_fg_bg_view, GTK_TYPE_DRAWING_AREA) G_DEFINE_TYPE (GimpFgBgView, gimp_fg_bg_view, GTK_TYPE_WIDGET)
#define parent_class gimp_fg_bg_view_parent_class #define parent_class gimp_fg_bg_view_parent_class
@ -87,6 +87,8 @@ gimp_fg_bg_view_class_init (GimpFgBgViewClass *klass)
static void static void
gimp_fg_bg_view_init (GimpFgBgView *view) gimp_fg_bg_view_init (GimpFgBgView *view)
{ {
GTK_WIDGET_SET_FLAGS (view, GTK_NO_WINDOW);
view->context = NULL; view->context = NULL;
} }
@ -103,6 +105,7 @@ gimp_fg_bg_view_set_property (GObject *object,
case PROP_CONTEXT: case PROP_CONTEXT:
gimp_fg_bg_view_set_context (view, g_value_get_object (value)); gimp_fg_bg_view_set_context (view, g_value_get_object (value));
break; break;
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
break; break;
@ -122,6 +125,7 @@ gimp_fg_bg_view_get_property (GObject *object,
case PROP_CONTEXT: case PROP_CONTEXT:
g_value_set_object (value, view->context); g_value_set_object (value, view->context);
break; break;
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
break; break;
@ -203,6 +207,7 @@ gimp_fg_bg_view_expose (GtkWidget *widget,
GdkEventExpose *eevent) GdkEventExpose *eevent)
{ {
GimpFgBgView *view = GIMP_FG_BG_VIEW (widget); GimpFgBgView *view = GIMP_FG_BG_VIEW (widget);
gint x, y;
gint width, height; gint width, height;
gint rect_w, rect_h; gint rect_w, rect_h;
GimpRGB color; GimpRGB color;
@ -210,6 +215,8 @@ gimp_fg_bg_view_expose (GtkWidget *widget,
if (! GTK_WIDGET_DRAWABLE (widget)) if (! GTK_WIDGET_DRAWABLE (widget))
return FALSE; return FALSE;
x = widget->allocation.x;
y = widget->allocation.y;
width = widget->allocation.width; width = widget->allocation.width;
height = widget->allocation.height; height = widget->allocation.height;
@ -224,7 +231,8 @@ gimp_fg_bg_view_expose (GtkWidget *widget,
gimp_fg_bg_view_draw_rect (view, gimp_fg_bg_view_draw_rect (view,
widget->window, widget->window,
widget->style->fg_gc[0], widget->style->fg_gc[0],
width - rect_w + 1, height - rect_h + 1, x + width - rect_w + 1,
y + height - rect_h + 1,
rect_w - 2, rect_h - 2, rect_w - 2, rect_h - 2,
&color); &color);
} }
@ -232,7 +240,7 @@ gimp_fg_bg_view_expose (GtkWidget *widget,
gtk_paint_shadow (widget->style, widget->window, GTK_STATE_NORMAL, gtk_paint_shadow (widget->style, widget->window, GTK_STATE_NORMAL,
GTK_SHADOW_IN, GTK_SHADOW_IN,
NULL, widget, NULL, NULL, widget, NULL,
width - rect_w, height - rect_h, rect_w, rect_h); x + width - rect_w, y + height - rect_h, rect_w, rect_h);
/* draw the foreground area */ /* draw the foreground area */
@ -242,7 +250,7 @@ gimp_fg_bg_view_expose (GtkWidget *widget,
gimp_fg_bg_view_draw_rect (view, gimp_fg_bg_view_draw_rect (view,
widget->window, widget->window,
widget->style->fg_gc[0], widget->style->fg_gc[0],
1, 1, x + 1, y + 1,
rect_w - 2, rect_h - 2, rect_w - 2, rect_h - 2,
&color); &color);
} }
@ -250,7 +258,7 @@ gimp_fg_bg_view_expose (GtkWidget *widget,
gtk_paint_shadow (widget->style, widget->window, GTK_STATE_NORMAL, gtk_paint_shadow (widget->style, widget->window, GTK_STATE_NORMAL,
GTK_SHADOW_OUT, GTK_SHADOW_OUT,
NULL, widget, NULL, NULL, widget, NULL,
0, 0, rect_w, rect_h); x, y, rect_w, rect_h);
return TRUE; return TRUE;
} }

10
app/widgets/gimpfgbgview.h
View File

@ -38,17 +38,17 @@ typedef struct _GimpFgBgViewClass GimpFgBgViewClass;
struct _GimpFgBgView struct _GimpFgBgView
{ {
GtkDrawingArea parent_instance; GtkWidget parent_instance;
GimpContext *context; GimpContext *context;
guchar *render_buf; guchar *render_buf;
gint render_buf_size; gint render_buf_size;
}; };
struct _GimpFgBgViewClass struct _GimpFgBgViewClass
{ {
GtkDrawingAreaClass parent_class; GtkWidgetClass parent_class;
}; };