X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=gtk%2Fxboard.c;h=8a2b8871371b68e5759765479aa8117f3eb86ff5;hb=2392a87503272e7ae1dcaa6aa8628955dc5493d1;hp=8d8311b2ac1cef73ee3f7aa239587f1cc8f45ece;hpb=ba019e81ec80db307f6a4e1fcd07f4fe259766b4;p=xboard.git

diff --git a/gtk/xboard.c b/gtk/xboard.c
index 8d8311b..8a2b887 100644
--- a/gtk/xboard.c
+++ b/gtk/xboard.c
@@ -890,6 +890,7 @@ main (int argc, char **argv)
 	snprintf(svgDir, MSG_SIZ, "%s/themes/default", dataDir);
 	suppress = (argc == 1 || argc > 1 && argv[1][00] != '-'); // OSX sends signal even if name was already argv[1]!
 	g_signal_connect(theApp, "NSApplicationOpenFile", G_CALLBACK(StartNewXBoard), NULL);
+	g_signal_connect(theApp, "NSApplicationWillTerminate", G_CALLBACK(ExitEvent), NULL);
 	// we must call application ready before we can get the signal,
 	// and supply a (dummy) menu bar before that, to avoid problems with dual apples in it
 	gtkosx_application_set_menu_bar(theApp, GTK_MENU_SHELL(gtk_menu_bar_new()));
@@ -1196,8 +1197,8 @@ main (int argc, char **argv)
 	gtk_widget_get_allocation(optList[W_WHITE].handle, &a);
 	clockKludge = hc = a.height;
 	gtk_widget_get_allocation(boardWidget, &a);
-//	marginW =  w - boardWidth; // [HGM] needed to set new shellWidget size when we resize board
-//	marginH =  h - a.height - hc; // subtract current clock height, so it can be added back dynamically
+	marginW =  w - boardWidth; // [HGM] needed to set new shellWidget size when we resize board
+	marginH =  h - a.height - hc; // subtract current clock height, so it can be added back dynamically
     }
 
     CreateAnyPieces(1);
@@ -1655,19 +1656,29 @@ void
 ReSize (WindowPlacement *wp)
 {
 	GtkAllocation a;
-	int sqx, sqy, w, h, hc, lg = lineGap;
+	int sqx, sqy, w, h, lg = lineGap;
 	static int first = 1;
-	gtk_widget_get_allocation(optList[W_BOARD].handle, &a);
 	if(wp->width == wpMain.width && wp->height == wpMain.height && !first) return; // not sized
-	sqx = (a.width - lg) / BOARD_WIDTH - lg;
-	sqy = (a.height - lg) / BOARD_HEIGHT - lg;
+	gtk_widget_get_allocation(optList[W_DROP+1].handle, &a); // table that should contain everything
+	w = a.width; h = a.height;
+	gtk_widget_get_allocation(shellWidget, &a);
+	if(a.width < w || a.height < h) { // outer window smaller than dialog content?
+	    w = a.width - w; h = a.height - h; // subtract matrgins, measured as table minus board dimensions
+	    gtk_widget_get_allocation(optList[W_BOARD].handle, &a);
+	    w += a.width; h += a.height;
+	} else {
+	    gtk_widget_get_allocation(optList[W_BOARD].handle, &a);
+	    w = a.width; h = a.height;
+	}
+	sqx = (w - lg) / BOARD_WIDTH - lg;
+	sqy = (h - lg) / BOARD_HEIGHT - lg;
 	if(sqy < sqx) sqx = sqy;
         if(sqx < 20) return;
 	if(appData.overrideLineGap < 0) { // do second iteration with adjusted lineGap
 	    int oldSqx = sqx;
 	    lg = lineGap = sqx < 37 ? 1 : sqx < 59 ? 2 : sqx < 116 ? 3 : 4;
-	    sqx = (a.width  - lg) / BOARD_WIDTH - lg;
-	    sqy = (a.height - lg) / BOARD_HEIGHT - lg;
+	    sqx = (w  - lg) / BOARD_WIDTH - lg;
+	    sqy = (h - lg) / BOARD_HEIGHT - lg;
 	    if(sqy < sqx) sqx = sqy;
 	    lg = sqx < 37 ? 1 : sqx < 59 ? 2 : sqx < 116 ? 3 : 4;
 	    if(sqx == oldSqx + 1 && lg == lineGap + 1) sqx = oldSqx, squareSize = 0; // prevent oscillations, force resize by kludge
@@ -1681,7 +1692,7 @@ ReSize (WindowPlacement *wp)
 	h = BOARD_HEIGHT * (squareSize + lineGap) + lineGap;
 	if(optList[W_BOARD].max   > w) optList[W_BOARD].max = w;
 	if(optList[W_BOARD].value > h) optList[W_BOARD].value = h;
-	first = 0;
+	first = appData.fixedSize;
 }
 
 static guint delayedDragTag = 0;