Adds code to set the view canvas's background color.

git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@173 f5e0f49d-192f-0410-a22d-a8d8700d0965

diff --git a/glabels2/src/color.c b/glabels2/src/color.c
index ad84ea481af02df651a73b738a924fe1599f4414..c3cc745ee37e625258d3194faba8fdacf9aebd37 100644 (file)
--- a/glabels2/src/color.c
+++ b/glabels2/src/color.c
@@ -37,3 +37,20 @@ gl_color_set_opacity (guint   color,
        return new_color;
 }
 
+/*****************************************************************************/
+/* Convert canvas color into a GdkColor                                      */
+/*****************************************************************************/
+GdkColor *
+gl_color_to_gdk_color (guint color)
+{
+       GdkColor *gdk_color;
+
+       gdk_color = g_new0 (GdkColor, 1);
+
+       gdk_color->red   = GL_COLOR_F_RED   (color) * 65535;
+       gdk_color->green = GL_COLOR_F_GREEN (color) * 65535;
+       gdk_color->blue  = GL_COLOR_F_BLUE  (color) * 65535;
+
+       return gdk_color;
+}
+

diff --git a/glabels2/src/color.h b/glabels2/src/color.h
index 22fe359d5926415194c2b172989895d52a6ff199..4ca88e2df4ce036381c5830ef30274ac3626ea0b 100644 (file)
--- a/glabels2/src/color.h
+++ b/glabels2/src/color.h
@@ -40,7 +40,9 @@ G_BEGIN_DECLS
 #define GL_COLOR_F_BLUE(x)  ( (((x)>>8)  & 0xff) / 255.0 )
 #define GL_COLOR_F_ALPHA(x) ( ( (x)      & 0xff) / 255.0 )
 
-guint gl_color_set_opacity (guint color, gdouble opacity);
+guint     gl_color_set_opacity (guint color, gdouble opacity);
+
+GdkColor *gl_color_to_gdk_color (guint color);
 
 G_END_DECLS
 

diff --git a/glabels2/src/view.c b/glabels2/src/view.c
index 1ba3e58fa6592f9890f13b33815368401a73563e..fc24a7d8df829d27d2d07cf7b9f8448a73a652ad 100644 (file)
--- a/glabels2/src/view.c
+++ b/glabels2/src/view.c
@@ -46,9 +46,10 @@
 /* Private macros and constants.                                            */
 /*==========================================================================*/
 
+#define BG_COLOR        GL_COLOR (192, 192, 192)
 #define OUTLINE_COLOR   GL_COLOR (173, 216, 230)
 #define PAPER_COLOR     GL_COLOR (255, 255, 255)
-#define GRID_COLOR      GL_COLOR (192, 192, 192)
+#define GRID_COLOR      BG_COLOR
 #define MARKUP_COLOR    GL_COLOR (240, 100, 100)
 
 #define SEL_LINE_COLOR  GL_COLOR_A (0, 0, 255, 128)
@@ -359,9 +360,10 @@ gl_view_construct (glView *view)
 static GtkWidget *
 gl_view_construct_canvas (glView *view)
 {
-       gdouble scale;
-       glLabel *label = view->label;
-       gdouble label_width, label_height;
+       gdouble   scale;
+       glLabel  *label = view->label;
+       gdouble   label_width, label_height;
+       GdkColor *bg_color;
 
        gl_debug (DEBUG_VIEW, "START");
 
@@ -372,6 +374,10 @@ gl_view_construct_canvas (glView *view)
        view->canvas = gnome_canvas_new_aa ();
        gtk_widget_pop_colormap ();
 
+       bg_color = gl_color_to_gdk_color (BG_COLOR);
+       gtk_widget_modify_bg (GTK_WIDGET(view->canvas), GTK_STATE_NORMAL, bg_color);
+       g_free (bg_color);
+
        gl_label_get_size (label, &label_width, &label_height);
        gl_debug (DEBUG_VIEW, "Label size: w=%lf, h=%lf",
                  label_width, label_height);