0.7.0.13: Fixed grid view state management when entering/exiting table data edit mode

Author: nfinit

src/sqlite-ce-edit/execute.c

@@ -275,10 +275,17 @@ void ExecuteSQL(const char *sql) {
     sqlite_progress_handler(g_db, 0, NULL, NULL);
 
     /* Switch to results */
+    if (g_gridView && g_hwndGrid)
+        SendMessage(g_hwndGrid, WM_SETREDRAW, FALSE, 0);
     SwitchView(1);
     SendMessage(g_hwndCB, TB_CHECKBUTTON, IDM_VIEWQUERY, FALSE);
     SendMessage(g_hwndCB, TB_CHECKBUTTON, IDM_VIEWRESULT, TRUE);
     SendMessage(g_hwndCB, TB_CHECKBUTTON, IDM_VIEWSCHEMA, FALSE);
+    if (g_gridView) PopulateGrid();
+    if (g_gridView && g_hwndGrid) {
+        SendMessage(g_hwndGrid, WM_SETREDRAW, TRUE, 0);
+        InvalidateRect(g_hwndGrid, NULL, TRUE);
+    }
 }
 
 void ExecuteQuery(void) {
@@ -613,10 +620,18 @@ void ExecuteQuery(void) {
 
     /* Switch to results view (unless error - stay in query to show cursor) */
     if (!hadError) {
+        /* Suppress redraw during view switch to avoid flicker */
+        if (g_gridView && g_hwndGrid)
+            SendMessage(g_hwndGrid, WM_SETREDRAW, FALSE, 0);
         SwitchView(1);
         SendMessage(g_hwndCB, TB_CHECKBUTTON, IDM_VIEWQUERY, FALSE);
         SendMessage(g_hwndCB, TB_CHECKBUTTON, IDM_VIEWRESULT, TRUE);
         SendMessage(g_hwndCB, TB_CHECKBUTTON, IDM_VIEWSCHEMA, FALSE);
+        if (g_gridView) PopulateGrid();
+        if (g_gridView && g_hwndGrid) {
+            SendMessage(g_hwndGrid, WM_SETREDRAW, TRUE, 0);
+            InvalidateRect(g_hwndGrid, NULL, TRUE);
+        }
         RefreshSchema();  /* Update schema in case CREATE/DROP was executed */
     }
 }

src/sqlite-ce-edit/globals.c

@@ -72,3 +72,4 @@ int g_recentQueryCount = 0;
 /* Grid edit mode state */
 int g_editMode = 0;                      /* 1 = grid is editable */
 char g_editTableName[128] = {0};         /* Table being edited */
+int g_gridViewBeforeEdit = 0;            /* Saved g_gridView state before edit mode */

src/sqlite-ce-edit/globals.h

@@ -82,7 +82,7 @@ BOOL WINAPI GetSaveFileNameW(CE_OPENFILENAME*);
 ** Version
 **============================================================================*/
 
-#define SQLITECEDIT_VERSION L"0.7.0.9"
+#define SQLITECEDIT_VERSION L"0.7.0.13"
 
 /*============================================================================
 ** Menu IDs
@@ -235,6 +235,7 @@ extern int g_recentQueryCount;
 /* Grid edit mode state */
 extern int g_editMode;
 extern char g_editTableName[128];
+extern int g_gridViewBeforeEdit;
 
 /*============================================================================
 ** Function Declarations - Output (output.c)

src/sqlite-ce-edit/schema.c

@@ -413,8 +413,19 @@ void OnSchemaExpanding(NMTREEVIEWW *pnm) {
 **============================================================================*/
 
 void ClearEditMode(void) {
+    if (!g_editMode) return;
+    
     g_editMode = 0;
     g_editTableName[0] = '\0';
+    
+    /* Restore previous grid/text view state */
+    g_gridView = g_gridViewBeforeEdit;
+    ShowWindow(g_hwndResult, g_gridView ? SW_HIDE : SW_SHOW);
+    if (g_hwndGrid) ShowWindow(g_hwndGrid, g_gridView ? SW_SHOW : SW_HIDE);
+    
+    /* Re-enable the grid toggle button */
+    SendMessage(g_hwndCB, TB_ENABLEBUTTON, IDM_EXECATCURSOR, TRUE);
+    SendMessage(g_hwndCB, TB_CHECKBUTTON, IDM_EXECATCURSOR, g_gridView);
 }
 
 /*============================================================================
@@ -488,6 +499,9 @@ void OpenTableForEditing(const char *tablename) {
             }
             sqlite_free_table(results);
 
+            /* Save current grid view state before entering edit mode */
+            g_gridViewBeforeEdit = g_gridView;
+            
             /* Set edit mode */
             g_editMode = 1;
             s = tablename;
@@ -510,6 +524,10 @@ void OpenTableForEditing(const char *tablename) {
             SendMessage(g_hwndCB, TB_CHECKBUTTON, IDM_VIEWQUERY, FALSE);
             SendMessage(g_hwndCB, TB_CHECKBUTTON, IDM_VIEWRESULT, TRUE);
             SendMessage(g_hwndCB, TB_CHECKBUTTON, IDM_VIEWSCHEMA, FALSE);
+            
+            /* Disable grid/text toggle button while in edit mode */
+            SendMessage(g_hwndCB, TB_ENABLEBUTTON, IDM_EXECATCURSOR, FALSE);
+            SendMessage(g_hwndCB, TB_CHECKBUTTON, IDM_EXECATCURSOR, TRUE);
         } else {
             if (errmsg) {
                 OutputLine(errmsg);