X-Git-Url: https://git.cworth.org/git?p=dvonn;a=blobdiff_plain;f=dvonn.c;fp=dvonn.c;h=43de664e9e362d9aa56d57ef9847d470a7f9e963;hp=1744770fc8e93404a80ee03e4e8593770593a22d;hb=e3c446d9470ae8426d0aeb37ecf478b4a6ffd705;hpb=c63c776c52cb865bc510b1feb9d17abe47086e5c

diff --git a/dvonn.c b/dvonn.c
index 1744770..43de664 100644
--- a/dvonn.c
+++ b/dvonn.c
@@ -166,13 +166,13 @@ on_expose_event_draw (GtkWidget		*widget,
 	layout->height = widget->allocation.height;
 
 	x_size = layout->width;
-	if (x_size > layout->height * BOARD_X_SIZE / BOARD_Y_SIZE)
-	    x_size = layout->height * BOARD_X_SIZE / BOARD_Y_SIZE;
+	if (x_size > layout->height * BOARD_X_SIZE / (1 + M_SQRT1_2 * (BOARD_Y_SIZE-1)))
+	    x_size = layout->height * BOARD_X_SIZE / (1 + M_SQRT1_2 * (BOARD_Y_SIZE-1));
 
 	/* Size must be a multiple of the integer cell_size */
 	layout->cell_size = x_size / BOARD_X_SIZE;
 	x_size = layout->cell_size * BOARD_X_SIZE;
-	y_size = layout->cell_size * BOARD_Y_SIZE;
+	y_size = layout->cell_size * (1 + M_SQRT1_2 * (BOARD_Y_SIZE-1));
 
 	layout->x_offset = (layout->width - x_size) / 2;
 	layout->y_offset = (layout->height - y_size) / 2;
@@ -196,7 +196,8 @@ on_expose_event_draw (GtkWidget		*widget,
 
 	    cairo_save (cr);
 	    cairo_translate(cr,
-			    x + (y - DVONN_BOARD_Y_SIZE/2) / 2.0, y);
+			    x + (y - DVONN_BOARD_Y_SIZE/2) / 2.0,
+			    M_SQRT1_2 * y);
 	    ring_path (cr);
 	    cairo_set_source_rgba (cr, 0.0, 0.0, 0.2, 0.1);
 	    cairo_fill (cr);
@@ -257,7 +258,7 @@ loa_game_create_view (loa_game_t *game)
 
     view_init (view, game, window);
 
-    gtk_window_set_default_size (GTK_WINDOW (window), 561, 255);
+    gtk_window_set_default_size (GTK_WINDOW (window), 780, 251);
 
     g_signal_connect (window, "delete-event",
 		      G_CALLBACK (on_delete_event_quit), NULL);