X-Git-Url: https://git.cworth.org/git?p=wordgame;a=blobdiff_plain;f=rack-fancy.c;h=c764677e6599eab7ff9dc6cd75e5f21f008333a3;hp=8420db237b0e5726554625e75f17a2516177850a;hb=HEAD;hpb=c5f4cf939caec0a862f7cbbeac1f43c24f4600af diff --git a/rack-fancy.c b/rack-fancy.c index 8420db2..c764677 100644 --- a/rack-fancy.c +++ b/rack-fancy.c @@ -29,7 +29,7 @@ #define RACK_DICT_ENTRY_OBSCURE (1<<1) #define RACK_DICT_ENTRY_FOUND (1<<2) -#define MAX_TILES 6 +#define MAX_TILES 7 typedef struct _tile { @@ -98,7 +98,7 @@ dict_paint_action (void *closure, char *word, dict_entry_t *entry) double new_x, new_y; int found, show_blanks = FALSE; - if (strlen (word) < 3) + if (strlen (word) < 5) return; found = *entry & RACK_DICT_ENTRY_FOUND; @@ -121,11 +121,16 @@ dict_paint_action (void *closure, char *word, dict_entry_t *entry) break; } - /* Don't bother displaying unfound obscure words. */ + /* "Obscure" words get some special coloring. */ if (*entry & RACK_DICT_ENTRY_OBSCURE) { - if (! found) - return; - cairo_set_source_rgb (cr, 0, 1, 0); /* green */ + if (found) { + cairo_set_source_rgb (cr, 0, 1, 0); /* green */ + } else { + if (cursor->show == DICT_PAINT_CURSOR_SHOW_ALL) + cairo_set_source_rgb (cr, 0, 0, 1); /* blue */ + else + return; + } } cairo_move_to (cr, cursor->x, cursor->y); @@ -559,7 +564,7 @@ create_window (rack_t *rack) GtkWidget *window, *scrolled_window; window = gtk_window_new (GTK_WINDOW_TOPLEVEL); - gtk_window_set_default_size (GTK_WINDOW (window), 430, 430); + gtk_window_set_default_size (GTK_WINDOW (window), 490, 490); gtk_widget_show (window); g_signal_connect (window, "delete_event", (GtkSignalFunc) on_delete_event, NULL); @@ -587,8 +592,8 @@ create_canvas (GtkWidget *parent, rack_t *rack) GooCanvasItem *root; canvas = goo_canvas_new (); - gtk_widget_set_size_request (canvas, 400, 400); - goo_canvas_set_bounds (GOO_CANVAS (canvas), 0, 0, 400, 400); + gtk_widget_set_size_request (canvas, 460, 460); + goo_canvas_set_bounds (GOO_CANVAS (canvas), 0, 0, 460, 460); gtk_widget_show (canvas); gtk_container_add (GTK_CONTAINER (parent), canvas); @@ -597,7 +602,7 @@ create_canvas (GtkWidget *parent, rack_t *rack) rack->solution_item = goo_demo_item_new (root, 20, LETTER_PAD + 2 * (LETTER_SIZE + 2 * LETTER_PAD), - 400 - 20, 400 - (LETTER_PAD + 2 * (LETTER_SIZE + 2 * LETTER_PAD)), + 460 - 20, 460 - (LETTER_PAD + 2 * (LETTER_SIZE + 2 * LETTER_PAD)), dict_paint, rack, NULL);