X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=gtk%2Fxboard.c;h=a7b10ca58b0b7ba4ccb12ae33acd95ae9041a64c;hb=9a84c7596671bd085afc8d927f9d0a38c2cff13f;hp=89d80589b06293f2e527737c25143d68f9da086e;hpb=2655364624f87e757fa8719d3510bdf02ccf850c;p=xboard.git

diff --git a/gtk/xboard.c b/gtk/xboard.c
index 89d8058..a7b10ca 100644
--- a/gtk/xboard.c
+++ b/gtk/xboard.c
@@ -256,6 +256,7 @@ GtkAccelGroup *GtkAccelerators;
 typedef unsigned int BoardSize;
 BoardSize boardSize;
 Boolean chessProgram;
+static int initialSquareSize;
 
 int  minX, minY; // [HGM] placement: volatile limits on upper-left corner
 int smallLayout = 0, tinyLayout = 0,
@@ -516,9 +517,9 @@ SaveFontArg (FILE *f, ArgDescriptor *ad)
       return;
   }
   for(i=0; i<NUM_SIZES; i++) // [HGM] font: current font becomes standard for current size
-    if(sizeDefaults[i].squareSize == squareSize) { // only for standard sizes!
-	fontTable[n][squareSize] = strdup(name);
-	fontValid[n][squareSize] = True;
+    if(sizeDefaults[i].squareSize == initialSquareSize) { // only for standard sizes!
+	fontTable[n][initialSquareSize] = strdup(name);
+	fontValid[n][initialSquareSize] = True;
 	break;
   }
   for(i=0; i<MAX_SIZE; i++) if(fontValid[n][i]) // [HGM] font: store all standard fonts
@@ -913,8 +914,8 @@ main (int argc, char **argv)
     if(argc > 1 && !strcmp(argv[1], "--show-config")) { // [HGM] install: called to print config info
 	typedef struct {char *name, *value; } Config;
 	static Config configList[] = {
-	  { "Datadir", DATADIR },
-	  { "Mandir", MANDIR },
+	  { "Datadir", dataDir },
+	  { "Mandir", manDir },
 	  { "Sysconfdir", SYSCONFDIR },
 	  { NULL }
 	};
@@ -1073,6 +1074,7 @@ main (int argc, char **argv)
 	tinyLayout = szd->tinyLayout;
 	// [HGM] font: use defaults from settings file if available and not overruled
     }
+    initialSquareSize = squareSize; // [HGM] remember for saving font info
     if(BOARD_WIDTH != 8) {
 	squareSize = (squareSize*8 + BOARD_WIDTH/2)/BOARD_WIDTH; // keep width the same
 	lineGap = (squareSize < 37 ? 1 : squareSize < 59 ? 2 : squareSize < 116 ? 3 : 4);
@@ -1697,6 +1699,12 @@ ReSize (WindowPlacement *wp)
 	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;
+	if(twoBoards && shellUp[DummyDlg]) {
+	    SlavePopUp(); dualOptions[3].max = 0; DoEvents(); // calls SlaveResize, kludge to force assigning new canvas
+	    partnerUp = !partnerUp; flipView = !flipView;
+	    DrawPosition(True, NULL);
+	    partnerUp = !partnerUp; flipView = !flipView;
+	}
 }
 
 static guint delayedDragTag = 0;