From bf7a38da089a2573b63b4f696dabcbd0ac1fb84f Mon Sep 17 00:00:00 2001 From: Eric House Date: Fri, 5 Aug 2016 21:19:49 -0700 Subject: [PATCH] copy more state into board being used for snapshot --- xwords4/common/board.c | 4 ++++ xwords4/linux/gtkboard.c | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/xwords4/common/board.c b/xwords4/common/board.c index a75fbda7f..7992160ca 100644 --- a/xwords4/common/board.c +++ b/xwords4/common/board.c @@ -408,6 +408,10 @@ board_drawSnapshot( const BoardCtxt* curBoard, DrawCtx* dctx, XP_U16 fontWidth = width / curBoard->gi->boardSize; board_figureLayout( newBoard, curBoard->gi, 0, 0, width, height, 0, 0, 0, fontWidth, width, XP_FALSE, NULL ); + + newBoard->showColors = curBoard->showColors; + newBoard->showGrid = curBoard->showGrid; + board_draw( newBoard ); board_destroy( newBoard ); } diff --git a/xwords4/linux/gtkboard.c b/xwords4/linux/gtkboard.c index 8c8f11dd4..ef2888834 100644 --- a/xwords4/linux/gtkboard.c +++ b/xwords4/linux/gtkboard.c @@ -699,6 +699,7 @@ static gboolean configure_event( GtkWidget* widget, GdkEventConfigure* XP_UNUSED(event), GtkGameGlobals* globals ) { + globals->gridOn = XP_TRUE; if ( globals->draw == NULL ) { createOrLoadObjects( globals ); } @@ -800,7 +801,6 @@ configure_event( GtkWidget* widget, GdkEventConfigure* XP_UNUSED(event), GTK_DIVIDER_WIDTH ); #endif - globals->gridOn = XP_TRUE; setCtrlsForTray( globals ); board_invalAll( board ); @@ -821,7 +821,6 @@ destroy_board_window( GtkWidget* XP_UNUSED(widget), GtkGameGlobals* globals ) } saveGame( &globals->cGlobals ); windowDestroyed( globals ); - // gtk_main_quit(); } static void