X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=gtk%2Fxboard.c;h=c5f81e84f6bf0b3df2fed28187ac9f3583031bcb;hb=7d2cf8e719aefa423f406fbf094e59b37a2c7ef1;hp=38ecb2dc0952bb581d56e52ebf76be275d30c68b;hpb=e6df7a018a00f4f5ed8c20882af27c9033d6aa5b;p=xboard.git

diff --git a/gtk/xboard.c b/gtk/xboard.c
index 38ecb2d..c5f81e8 100644
--- a/gtk/xboard.c
+++ b/gtk/xboard.c
@@ -199,7 +199,6 @@ void MoveTypeInProc P((GdkEventKey *eventkey));
 gboolean KeyPressProc P((GtkWindow *window, GdkEventKey *eventkey, gpointer data));
 Boolean TempBackwardActive = False;
 void DisplayMove P((int moveNumber));
-void ICSInitScript P((void));
 void update_ics_width P(());
 int CopyMemoProc P(());
 static gboolean EventProc P((GtkWidget *widget, GdkEvent *event, gpointer g));
@@ -1454,11 +1453,17 @@ CoDrag (GtkWidget *sh, WindowPlacement *wp)
 void
 ReSize (WindowPlacement *wp)
 {
-	int sqx, sqy, w, h;
+	int sqx, sqy, w, h, lg = lineGap;
 	if(wp->width == wpMain.width && wp->height == wpMain.height) return; // not sized
-	sqx = (wp->width  - lineGap - marginW) / BOARD_WIDTH - lineGap;
-	sqy = (wp->height - lineGap - marginH) / BOARD_HEIGHT - lineGap;
+	sqx = (wp->width  - lg - marginW) / BOARD_WIDTH - lg;
+	sqy = (wp->height - lg - marginH) / BOARD_HEIGHT - lg;
 	if(sqy < sqx) sqx = sqy;
+	if(appData.overrideLineGap < 0) { // do second iteration with adjusted lineGap
+	    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) / BOARD_HEIGHT - lg;
+	    if(sqy < sqx) sqx = sqy;
+	}
 	if(sqx != squareSize) {
 //printf("new sq size %d (%dx%d)\n", sqx, wp->width, wp->height);
 	    squareSize = sqx; // adopt new square size