lbxgui: Add a toggle between patterned and solid background.

The patterned background makes it hard to see images that consist mostly
of transparent pixels.

diff --git a/src/gui/lbxgui.c b/src/gui/lbxgui.c
index 4bc815740abbffc2f69ce546fe418d83f3df3981..be629fd98ea618a6516713b332a0bdd146681f59 100644 (file)
--- a/src/gui/lbxgui.c
+++ b/src/gui/lbxgui.c
@@ -261,6 +261,24 @@ void set_image(GtkComboBox *combo)
        redraw_image();
 }
 
+void set_background(GtkCheckMenuItem *item, gpointer data)
+{
+       GdkColor black = { .red = 0,      .green = 0,      .blue = 0      };
+       GdkColor dark  = { .red = 0x6666, .green = 0x6666, .blue = 0x6666 };
+       GdkColor light = { .red = 0x9999, .green = 0x9999, .blue = 0x9999 };
+
+       if (gtk_check_menu_item_get_active(item)) {
+               /* Enable stippled background. */
+               gdk_gc_set_rgb_fg_color(bg_gc, &dark);
+               gdk_gc_set_rgb_bg_color(bg_gc, &light);
+               gdk_gc_set_fill(bg_gc, GDK_OPAQUE_STIPPLED);
+       } else {
+               gdk_gc_set_rgb_fg_color(bg_gc, &black);
+               gdk_gc_set_fill(bg_gc, GDK_SOLID);
+       }
+       redraw_image();
+}
+
 void show_about(GtkWidget *widget)
 {
        GtkWindow *parent = GTK_WINDOW(gtk_widget_get_toplevel(widget));
@@ -410,21 +428,22 @@ static void init_interface(void)
        init_combobox(builder, "overchooser");
 }
 
-static GdkBitmap *init_background(GdkDrawable *drawable, GdkGC *gc)
+static void init_background(GdkDrawable *drawable)
 {
-       GdkColor fg = { .red = 0x6666, .green = 0x6666, .blue = 0x6666 };
-       GdkColor bg = { .red = 0x9999, .green = 0x9999, .blue = 0x9999 };
+       GtkWidget *check;
        GdkBitmap *bitmap;
 
+       bg_gc = gdk_gc_new(canvas->window);
+
        bitmap = gdk_bitmap_create_from_data(drawable, bg_bits,
                bg_width, bg_height);
 
-       gdk_gc_set_rgb_fg_color(gc, &fg);
-       gdk_gc_set_rgb_bg_color(gc, &bg);
-       gdk_gc_set_fill(gc, GDK_OPAQUE_STIPPLED);
-       gdk_gc_set_stipple(gc, bitmap);
-       gdk_gc_set_ts_origin(gc, 0, 0);
-       return bitmap;
+       gdk_gc_set_stipple(bg_gc, bitmap);
+       gdk_gc_set_ts_origin(bg_gc, 0, 0);
+
+       check = GTK_WIDGET(gtk_builder_get_object(builder, "menu-background"));
+       gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(check), TRUE);
+       set_background(GTK_CHECK_MENU_ITEM(check), NULL);
 }
 
 int main(int argc, char **argv)
@@ -457,7 +476,6 @@ int main(int argc, char **argv)
        g_timeout_add(10, timeout, NULL);
        gtk_widget_show_all(window);
 
-       bg_gc = gdk_gc_new(canvas->window);
-       init_background(canvas->window, bg_gc);
+       init_background(canvas->window);
        gtk_main();
 }

diff --git a/src/gui/lbxgui.glade b/src/gui/lbxgui.glade
index a22f67643a171fe242f1d1e99b07d03a2467197c..f70cfa1424ca44d985ff66ad9217533924e672d7 100644 (file)
--- a/src/gui/lbxgui.glade
+++ b/src/gui/lbxgui.glade
@@ -45,6 +45,27 @@
                 </child>
               </object>
             </child>
+            <child>
+              <object class="GtkMenuItem" id="displaymenu">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">_Display</property>
+                <property name="use_underline">True</property>
+                <child type="submenu">
+                  <object class="GtkMenu" id="menu3">
+                    <property name="visible">True</property>
+                    <child>
+                      <object class="GtkCheckMenuItem" id="menu-background">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">_Pattern background</property>
+                        <property name="use_underline">True</property>
+                        <accelerator key="t" signal="activate"/>
+                        <signal name="toggled" handler="set_background"/>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
             <child>
               <object class="GtkMenuItem" id="helpmenu">
                 <property name="visible">True</property>