X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=gtk%2Fxboard.c;h=a8afcb32a4e7a10b255f6c6d7cffb05af45c684c;hb=8cadd120c307bb1049f6d08d9ae23f67432bd038;hp=f134d8b1e3dad5450072889972598d41e70f4d6c;hpb=e6fd287ffbf67a41aff2e615c6cb62555a29f5c2;p=xboard.git

diff --git a/gtk/xboard.c b/gtk/xboard.c
index f134d8b..a8afcb3 100644
--- a/gtk/xboard.c
+++ b/gtk/xboard.c
@@ -167,7 +167,7 @@ extern char *getenv();
 #include "gettext.h"
 #include "draw.h"
 
-#ifdef __APPLE__
+#ifdef OSXAPP
 #  include <gtkmacintegration/gtkosxapplication.h>
    // prevent pathname of positional file argument provided by OS X being be mistaken for option name
    // (price is that we won't recognize Windows option format anymore).
@@ -650,9 +650,12 @@ ResizeBoardWindow (int w, int h, int inhibit)
     gtk_widget_get_allocation(shellWidget, &a);
     marginW = a.width - bw;
     gtk_widget_get_allocation(optList[W_WHITE].handle, &a);
-    w += marginW + 1; // [HGM] not sure why the +1 is (sometimes) needed...
-    h += marginH + a.height + 1;
+    gtk_widget_set_size_request(optList[W_BOARD].handle, w, h);   // protect board widget
+//    w += marginW + 1; // [HGM] not sure why the +1 is (sometimes) needed...
+//    h += marginH + a.height + 1;
     gtk_window_resize(GTK_WINDOW(shellWidget), w, h);
+    DoEvents();
+    gtk_widget_set_size_request(optList[W_BOARD].handle, -1, -1); // liberate board again
 }
 
 int
@@ -828,7 +831,7 @@ LoadIconFile (gchar *svgFilename)
     return gdk_pixbuf_new_from_file(buf, NULL);
 }
 
-#ifdef __APPLE__
+#ifdef OSXAPP
 static char clickedFile[MSG_SIZ];
 static int suppress;
 
@@ -874,7 +877,7 @@ main (int argc, char **argv)
 
     /* set up GTK */
     gtk_init (&argc, &argv);
-#ifdef __APPLE__
+#ifdef OSXAPP
     {   // prepare to catch OX OpenFile signal, which will tell us the clicked file
 	char *path = gtkosx_application_get_bundle_path();
 #ifdef ENABLE_NLS
@@ -1193,7 +1196,7 @@ 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
+	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
     }
 
@@ -1652,26 +1655,34 @@ void
 ReSize (WindowPlacement *wp)
 {
 	GtkAllocation a;
-	int sqx, sqy, w, h, hc, lg = lineGap;
-	gtk_widget_get_allocation(optList[W_WHITE].handle, &a);
-	hc = a.height; // clock height can depend on single / double line clock text!
-        if(clockKludge && hc != clockKludge) wp->height += hc - clockKludge, clockKludge = 0;
-	wpMain.height = BOARD_HEIGHT * (squareSize + lineGap) + lineGap + marginH + hc;
-	if(wp->width == wpMain.width && wp->height == wpMain.height) return; // not sized
-	sqx = (wp->width  - lg - marginW) / BOARD_WIDTH - lg;
-	sqy = (wp->height - lg - marginH - hc) / BOARD_HEIGHT - lg;
+	int sqx, sqy, w, h, lg = lineGap;
+	static int first = 1;
+	if(wp->width == wpMain.width && wp->height == wpMain.height && !first) return; // not sized
+	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 = (wp->width  - lg - marginW) / BOARD_WIDTH - lg;
-	    sqy = (wp->height - lg - marginH - hc) / 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
 	}
-	if(sqx != squareSize) {
+	if(sqx != squareSize && !first) {
 	    squareSize = sqx; // adopt new square size
 	    CreatePNGPieces(); // make newly scaled pieces
 	    InitDrawingSizes(0, 0); // creates grid etc.
@@ -1680,6 +1691,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 = appData.fixedSize;
 }
 
 static guint delayedDragTag = 0;
@@ -1691,7 +1703,7 @@ DragProc ()
 	if(busy) return;
 
 	busy = 1;
-//	GetActualPlacement(shellWidget, &wpNew);
+	GetActualPlacement(shellWidget, &wpNew);
 	if(wpNew.x == wpMain.x && wpNew.y == wpMain.y && // not moved
 	   wpNew.width == wpMain.width && wpNew.height == wpMain.height) { // not sized
 	    busy = 0; return; // false alarm
@@ -1951,7 +1963,7 @@ TempForwardProc (Widget w, XEvent *event, String *prms, Cardinal *nprms)
 void
 ManProc ()
 {   // called from menu
-#ifdef __APPLE__
+#ifdef OSXAPP
     char buf[MSG_SIZ];
     snprintf(buf, MSG_SIZ, "%s ./man.command", appData.sysOpen);
     system(buf);
@@ -2064,7 +2076,7 @@ SetClockIcon (int color)
     GdkPixbuf *pm = *clockIcons[color];
     if (mainwindowIcon != pm) {
         mainwindowIcon = pm;
-#ifdef __APPLE__
+#ifdef OSXAPP
         gtkosx_application_set_dock_icon_pixbuf(theApp, mainwindowIcon);
 #else
         gtk_window_set_icon(GTK_WINDOW(shellWidget), mainwindowIcon);