Added preliminary full-screen mode accessible from view menu or with Alt+Enter shortcut. Keybinds are currently bugged and require the application to be restarted to get out of full screen, preparing to refactor global shortcut management.

Author: nfinit

src/sqlite-ce-edit/editor.c

@@ -508,7 +508,10 @@ LRESULT CALLBACK ResultEditProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPara
         }
         /* F6/Escape - back to query, Ctrl+1 - Query, Ctrl+2 - Results, Ctrl+3 - Schema */
         if (wParam == VK_F6 || wParam == VK_ESCAPE || wParam == VK_BACK) {
-            SendMessage(g_hwndMain, WM_COMMAND, IDM_VIEWQUERY, 0);
+            if (wParam == VK_ESCAPE && g_fullScreen)
+                SendMessage(g_hwndMain, WM_COMMAND, IDM_FULLSCREEN, 0);
+            else
+                SendMessage(g_hwndMain, WM_COMMAND, IDM_VIEWQUERY, 0);
             return 0;
         }
         if (wParam == VK_F7) {

src/sqlite-ce-edit/globals.c

@@ -43,6 +43,7 @@ int g_fontSizeSchema = 2;
 int g_showLineNumbers = 1;
 int g_lineNumWidth = 0;
 int g_showStatusBar = 1;
+int g_fullScreen = 0;
 WNDPROC g_pfnQueryProc;
 WNDPROC g_pfnResultProc;
 WNDPROC g_pfnGridProc;

src/sqlite-ce-edit/globals.h

@@ -82,7 +82,7 @@ BOOL WINAPI GetSaveFileNameW(CE_OPENFILENAME*);
 ** Version
 **============================================================================*/
 
-#define SQLITECEDIT_VERSION L"0.9.0.36"
+#define SQLITECEDIT_VERSION L"0.9.0.37"
 
 /*============================================================================
 ** Menu IDs
@@ -135,6 +135,7 @@ BOOL WINAPI GetSaveFileNameW(CE_OPENFILENAME*);
 #define IDM_EXPORTDDL     704
 #define IDM_EXPORTALLDDL  705
 #define IDM_STATUSBAR     706
+#define IDM_FULLSCREEN    707
 
 /* Timer IDs */
 #define IDT_TAPHOLD 1
@@ -209,6 +210,7 @@ extern int g_fontSizeSchema;
 extern int g_showLineNumbers;
 extern int g_lineNumWidth;
 extern int g_showStatusBar;
+extern int g_fullScreen;
 extern WNDPROC g_pfnQueryProc;
 extern WNDPROC g_pfnResultProc;
 extern WNDPROC g_pfnGridProc;

src/sqlite-ce-edit/grid.c

@@ -129,7 +129,10 @@ LRESULT CALLBACK GridProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) {
         }
         /* F6/Escape/Backspace - back to query */
         if (wParam == VK_F6 || wParam == VK_ESCAPE || wParam == VK_BACK) {
-            SendMessage(g_hwndMain, WM_COMMAND, IDM_VIEWQUERY, 0);
+            if (wParam == VK_ESCAPE && g_fullScreen)
+                SendMessage(g_hwndMain, WM_COMMAND, IDM_FULLSCREEN, 0);
+            else
+                SendMessage(g_hwndMain, WM_COMMAND, IDM_VIEWQUERY, 0);
             return 0;
         }
         if (wParam == VK_F7) {

src/sqlite-ce-edit/main.c

@@ -110,6 +110,7 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPara
             AppendMenuW(hView, MF_STRING, IDM_VIEWSCHEMA, L"&Schema\tCtrl+3, F7");
             AppendMenuW(hView, MF_SEPARATOR, 0, NULL);
             AppendMenuW(hView, MF_STRING | MF_CHECKED, IDM_STATUSBAR, L"Status &Bar");
+            AppendMenuW(hView, MF_STRING, IDM_FULLSCREEN, L"&Full Screen\tAlt+Enter");
             g_hViewMenu = hView;
             AppendMenuW(hMenu, MF_POPUP, (UINT)hView, L"&View");
 
@@ -261,9 +262,9 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPara
 
             SendMessage(g_hwndStatus, WM_SIZE, 0, 0);
             GetWindowRect(g_hwndStatus, &rcStatus);
-            sbHeight = g_showStatusBar ? (rcStatus.bottom - rcStatus.top) : 0;
+            sbHeight = (g_showStatusBar && !g_fullScreen) ? (rcStatus.bottom - rcStatus.top) : 0;
 
-            cbHeight = CommandBar_Height(g_hwndCB);
+            cbHeight = g_fullScreen ? 0 : CommandBar_Height(g_hwndCB);
             GetClientRect(hwnd, &rc);
             editHeight = rc.bottom - cbHeight - sbHeight;
             queryLeft = g_showLineNumbers ? g_lineNumWidth : 0;
@@ -381,6 +382,13 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPara
                     CheckMenuItem(g_hViewMenu, IDM_STATUSBAR, g_showStatusBar ? MF_CHECKED : MF_UNCHECKED);
                     SendMessage(hwnd, WM_SIZE, 0, 0);
                     break;
+                case IDM_FULLSCREEN:
+                    g_fullScreen = !g_fullScreen;
+                    ShowWindow(g_hwndStatus, g_fullScreen ? SW_HIDE : (g_showStatusBar ? SW_SHOW : SW_HIDE));
+                    ShowWindow(g_hwndCB, g_fullScreen ? SW_HIDE : SW_SHOW);
+                    CheckMenuItem(g_hViewMenu, IDM_FULLSCREEN, g_fullScreen ? MF_CHECKED : MF_UNCHECKED);
+                    SendMessage(hwnd, WM_SIZE, 0, 0);
+                    break;
                 case IDM_SCHEMA_SELECT:
                     OnSchemaDoubleClick();
                     break;
@@ -433,6 +441,10 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPara
                 SendMessage(hwnd, WM_CLOSE, 0, 0);
                 return 0;
             }
+            if (wParam == VK_RETURN && GetKeyState(VK_MENU) < 0) {
+                SendMessage(hwnd, WM_COMMAND, IDM_FULLSCREEN, 0);
+                return 0;
+            }
             break;
 
         case WM_KEYDOWN:
@@ -522,7 +534,11 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPara
                         OnSchemaDoubleClick();
                         return TRUE;
                     } else if (pKey->wVKey == VK_ESCAPE) {
-                        SendMessage(hwnd, WM_COMMAND, IDM_VIEWQUERY, 0);
+                        if (g_fullScreen) {
+                            SendMessage(hwnd, WM_COMMAND, IDM_FULLSCREEN, 0);
+                        } else {
+                            SendMessage(hwnd, WM_COMMAND, IDM_VIEWQUERY, 0);
+                        }
                         return TRUE;
                     } else if (GetKeyState(VK_CONTROL) < 0) {
                         if (pKey->wVKey == '1') SendMessage(hwnd, WM_COMMAND, IDM_VIEWQUERY, 0);