X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=dialogs.c;h=0c1abf1beb5c333b5cdf2def91dbef49da9ab66b;hb=88a788118a6c2a024d3a3dc42105ca0335f6812f;hp=2cdf6a9b6ff9873ec03709e4a7ce7a91a20fa7ee;hpb=f5445dab3a8035dfdfa3eb8581d323c0661390fb;p=xboard.git diff --git a/dialogs.c b/dialogs.c index 2cdf6a9..0c1abf1 100644 --- a/dialogs.c +++ b/dialogs.c @@ -1624,6 +1624,8 @@ ShuffleMenuProc () static void AdjustFont P((int n)); +static char *oldFont[7]; + static int FontsOK (int n) { @@ -1631,17 +1633,27 @@ FontsOK (int n) int i; PopDown(TransientDlg); // Early popdown to prevent expose events frommasking each other LockBoardSize(0); - DisplayBothClocks(); - ApplyFont(&mainOptions[W_MESSG], NULL); - for(i=1; i<6; i++) ApplyFont(&mainOptions[W_BUTTON+i], NULL); - LockBoardSize(1); - ApplyFont(&tagsOptions[1], NULL); - ApplyFont(&historyOptions[0], NULL); - ApplyFont(&engoutOptions[5], NULL); - ApplyFont(&engoutOptions[12], NULL); - ApplyFont(&gamesOptions[0], NULL); - ApplyFont(&chatOptions[11], appData.icsFont); - AppendColorized(&chatOptions[6], NULL, 0); // kludge to replace font tag + if(strcmp(oldFont[0], appData.clockFont)) fontIsSet[CLOCK_FONT] = 1, DisplayBothClocks(); + if(strcmp(oldFont[1], appData.font)) { + fontIsSet[MESSAGE_FONT] = 1; + ApplyFont(&mainOptions[W_MESSG], NULL); + for(i=1; i<6; i++) ApplyFont(&mainOptions[W_BUTTON+i], NULL); + } + LockBoardSize(1); // unlock + if(strcmp(oldFont[3], appData.tagsFont)) fontIsSet[EDITTAGS_FONT] = 1, ApplyFont(&tagsOptions[1], NULL); + if(strcmp(oldFont[4], appData.commentFont)) fontIsSet[COMMENT_FONT] = 1, ApplyFont(&commentOptions[0], NULL); + if(strcmp(oldFont[5], appData.historyFont)) { + fontIsSet[MOVEHISTORY_FONT] = 1; + ApplyFont(&historyOptions[0], NULL); + ApplyFont(&engoutOptions[5], NULL); + ApplyFont(&engoutOptions[12], NULL); + } + if(strcmp(oldFont[6], appData.gameListFont)) fontIsSet[GAMELIST_FONT] = 1, ApplyFont(&gamesOptions[0], NULL); + if(strcmp(oldFont[2], appData.icsFont)) { + fontIsSet[CONSOLE_FONT] = 1; + ApplyFont(&chatOptions[11], appData.icsFont); + AppendColorized(&chatOptions[6], NULL, 0); // kludge to replace font tag + } DrawPosition(TRUE, NULL); // for coord font return 0; // suppress normal popdown because already done } @@ -1745,7 +1757,10 @@ FontsProc () int i; if(strstr(appData.font, "-*-")) { DisplayNote(_("This only works in the GTK build")); return; } GenericPopUp(fontOptions, _("Fonts"), TransientDlg, BoardWindow, MODAL, 0); - for(i=0; i<6; i++) ApplyFont(&fontOptions[6*i], *(char**)fontOptions[6*i].target); + for(i=0; i<7; i++) { + ApplyFont(&fontOptions[6*i], *(char**)fontOptions[6*i].target); + ASSIGN(oldFont[i], *(char**)fontOptions[6*i].target); + } } //------------------------------------------------------ Time Control -----------------------------------