X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=main.c;h=15fbce446fbc41771d509ec9f29ad86a6141c7c4;hb=4b4b752bb845106529d270b73419b97e11d595c2;hp=3b1d8d43c108e27e4d431a47d3c930b20e20e1e0;hpb=4be5b6593af8db64cd39dba290a2c64193bcdabd;p=akamaru

diff --git a/main.c b/main.c
index 3b1d8d4..15fbce4 100644
--- a/main.c
+++ b/main.c
@@ -279,7 +279,7 @@ model_init_dock (Model *model)
 
   model->polygons = g_new (Polygon, 1);
   model->num_polygons = 1;
-  polygon_init_rectangle (&model->polygons[0], -400, 300, 1400, 350);
+  polygon_init_enclosing_rectangle (&model->polygons[0], 10, 10, 700, 500);
 
   model->anchors[0].x = 300;
   model->anchors[0].y = 300;
@@ -441,14 +441,22 @@ draw_polygons (cairo_t *cr, Model *model, Color *color)
 
   for (i = 0; i < model->num_polygons; i++) {
     p = &model->polygons[i];
-    cairo_set_source_rgba (cr, color->red, color->green, color->blue, 0.4);
-
     
     for (j = 0; j < p->num_points; j++)
       cairo_line_to (cr, p->points[j].x, p->points[j].y);
     cairo_close_path (cr);
+
+    if (p->enclosing) {
+      cairo_set_source_rgba (cr, color->red, color->green, color->blue, 0.1);
+      cairo_fill_preserve (cr);
+    }
+
+    cairo_set_source_rgba (cr, color->red, color->green, color->blue, 0.4);
+    if (p->enclosing)
+      cairo_stroke (cr);
+    else
+      cairo_fill (cr);
   }
-  cairo_fill (cr);
 
 }
 
@@ -664,7 +672,7 @@ create_window (Closure *closure)
   GtkWidget *model_combo;
 
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  gtk_window_set_title (GTK_WINDOW (window), "Akamaru");
+  gtk_window_set_title (GTK_WINDOW (window), "赤丸");
 
   g_signal_connect (window, "destroy",
 		    G_CALLBACK (gtk_main_quit), &window);