format code

sumatrapdfreader · Mar 29, 2023 · 2cc4297 · 2cc4297
1 parent 33ede9b
commit 2cc4297
Show file tree

Hide file tree

Showing 5 changed files with 113 additions and 115 deletions.
diff --git a/src/Accelerators.cpp b/src/Accelerators.cpp
@@ -81,114 +81,114 @@
     V(VK_F24, "F24")
 
 ACCEL gBuiltInAccelerators[] = {
-        {0, 'k', CmdScrollUp},
-        {0, 'j', CmdScrollDown},
-        {0, 'h', CmdScrollLeft},
-        {0, 'l', CmdScrollRight},
-        {FVIRTKEY, VK_UP, CmdScrollUp},
-        {FVIRTKEY, VK_DOWN, CmdScrollDown},
-        {FVIRTKEY, VK_LEFT, CmdScrollLeft},
-        {FVIRTKEY, VK_RIGHT, CmdScrollRight},
-
-        {FSHIFT | FVIRTKEY, VK_UP, CmdScrollUpHalfPage},
-        {FSHIFT | FVIRTKEY, VK_DOWN, CmdScrollDownHalfPage},
-
-        {FSHIFT | FVIRTKEY, VK_LEFT, CmdScrollLeftPage},
-        {FSHIFT | FVIRTKEY, VK_RIGHT, CmdScrollRightPage},
-
-        // TODO: maybe CmdGoToNextPage / CmdGoToPrevPage is better
-        {FVIRTKEY, VK_NEXT, CmdScrollDownPage},
-        {FVIRTKEY, VK_PRIOR, CmdScrollUpPage},
-
-        {FVIRTKEY, VK_SPACE, CmdScrollDownPage},
-        {FVIRTKEY, VK_RETURN, CmdScrollDownPage},
-        {FCONTROL | FVIRTKEY, VK_DOWN, CmdScrollDownPage},
-
-        {FSHIFT | FVIRTKEY, VK_SPACE, CmdScrollUpPage},
-        {FSHIFT | FVIRTKEY, VK_RETURN, CmdScrollUpPage},
-        {FCONTROL | FVIRTKEY, VK_UP, CmdScrollUpPage},
-
-        {0, 'n', CmdGoToNextPage},
-        //{FCONTROL | FVIRTKEY, VK_NEXT, CmdGoToNextPage},
-
-        {0, 'p', CmdGoToPrevPage},
-        //{FCONTROL | FVIRTKEY, VK_PRIOR, CmdGoToPrevPage},
-
-        {FVIRTKEY, VK_HOME, CmdGoToFirstPage},
-        {FCONTROL | FVIRTKEY, VK_HOME, CmdGoToFirstPage},
-        {FVIRTKEY, VK_END, CmdGoToLastPage},
-        {FCONTROL | FVIRTKEY, VK_END, CmdGoToLastPage},
-
-        {FVIRTKEY, VK_BACK, CmdNavigateBack},
-        {FALT | FVIRTKEY, VK_LEFT, CmdNavigateBack},
-        {FSHIFT | FVIRTKEY, VK_BACK, CmdNavigateForward},
-        {FALT | FVIRTKEY, VK_RIGHT, CmdNavigateForward},
-
-        {FCONTROL | FVIRTKEY, 'O', CmdOpenFile},
-        {FSHIFT | FCONTROL | FVIRTKEY, VK_RIGHT, CmdOpenNextFileInFolder},
-        {FSHIFT | FCONTROL | FVIRTKEY, VK_LEFT, CmdOpenPrevFileInFolder},
-        {FVIRTKEY, VK_F2, CmdRenameFile},
-        {FCONTROL | FVIRTKEY, 'W', CmdClose},
-        {FCONTROL | FVIRTKEY, 'N', CmdNewWindow},
-        {FSHIFT | FCONTROL | FVIRTKEY, 'N', CmdDuplicateInNewWindow},
-        {FCONTROL | FVIRTKEY, 'S', CmdSaveAs},
-        //{FSHIFT | FCONTROL | FVIRTKEY, 'S', CmdCreateShortcutToFile},
-
-        {FCONTROL | FVIRTKEY, 'A', CmdSelectAll},
-        {FCONTROL | FVIRTKEY, 'B', CmdFavoriteAdd},
-        {FCONTROL | FVIRTKEY, 'C', CmdCopySelection},
-        {FCONTROL | FVIRTKEY, VK_INSERT, CmdCopySelection},
-        {FCONTROL | FVIRTKEY, 'D', CmdProperties},
-        {FCONTROL | FVIRTKEY, 'F', CmdFindFirst},
-        {FCONTROL | FVIRTKEY, 'G', CmdGoToPage},
-        {0, 'g', CmdGoToPage},
-        {FCONTROL | FVIRTKEY, 'K', CmdCommandPalette},
-        {FSHIFT | FCONTROL | FVIRTKEY, 'K', CmdCommandPaletteNoFiles},
-        {FSHIFT | FCONTROL | FVIRTKEY, 'S', CmdSaveAnnotations},
-        {FCONTROL | FVIRTKEY, 'P', CmdPrint},
-        {FCONTROL | FVIRTKEY, 'Q', CmdExit},
-        {FCONTROL | FVIRTKEY, 'Y', CmdZoomCustom},
-        {FCONTROL | FVIRTKEY, '0', CmdZoomFitPage},
-        {FCONTROL | FVIRTKEY, VK_NUMPAD0, CmdZoomFitPage},
-        {FCONTROL | FVIRTKEY, '1', CmdZoomActualSize},
-        {FCONTROL | FVIRTKEY, VK_NUMPAD1, CmdZoomActualSize},
-        {FCONTROL | FVIRTKEY, '2', CmdZoomFitWidth},
-        {FCONTROL | FVIRTKEY, VK_NUMPAD2, CmdZoomFitWidth},
-        {FCONTROL | FVIRTKEY, '3', CmdZoomFitContent},
-        {FCONTROL | FVIRTKEY, VK_NUMPAD3, CmdZoomFitContent},
-        {FCONTROL | FVIRTKEY, VK_ADD, CmdZoomIn},
-        {FCONTROL | FVIRTKEY, VK_SUBTRACT, CmdZoomOut},
-        {FCONTROL | FVIRTKEY, VK_OEM_MINUS, CmdZoomOut},
-        {FCONTROL | FVIRTKEY, '6', CmdSinglePageView},
-        {FCONTROL | FVIRTKEY, VK_NUMPAD6, CmdSinglePageView},
-        {FCONTROL | FVIRTKEY, '7', CmdFacingView},
-        {FCONTROL | FVIRTKEY, VK_NUMPAD7, CmdFacingView},
-        {FCONTROL | FVIRTKEY, '8', CmdBookView},
-        {FCONTROL | FVIRTKEY, VK_NUMPAD8, CmdBookView},
-        {FSHIFT | FCONTROL | FVIRTKEY, VK_ADD, CmdRotateRight},
-        {FCONTROL | FVIRTKEY, VK_OEM_PLUS, CmdZoomIn},
-        {FSHIFT | FCONTROL | FVIRTKEY, VK_OEM_PLUS, CmdRotateRight},
-        {FVIRTKEY, VK_F3, CmdFindNext},
-        {FSHIFT | FVIRTKEY, VK_F3, CmdFindPrev},
-        {FCONTROL | FVIRTKEY, VK_F3, CmdFindNextSel},
-        {FSHIFT | FCONTROL | FVIRTKEY, VK_F3, CmdFindPrevSel},
-        {FCONTROL | FVIRTKEY, VK_F4, CmdClose},
-        {FVIRTKEY, VK_F6, CmdMoveFrameFocus},
-        {FVIRTKEY, VK_F8, CmdToggleToolbar},
-        {FVIRTKEY, VK_F9, CmdToggleMenuBar},
-        {FCONTROL | FVIRTKEY, 'L', CmdTogglePresentationMode},
-        {FVIRTKEY, VK_F5, CmdTogglePresentationMode},
-        {FSHIFT | FVIRTKEY, VK_F11, CmdTogglePresentationMode},
-        {FSHIFT | FCONTROL | FVIRTKEY, 'L', CmdToggleFullscreen},
-        {FVIRTKEY, VK_F11, CmdToggleFullscreen},
-        {FVIRTKEY, VK_F12, CmdToggleBookmarks},
-        {FSHIFT | FVIRTKEY, VK_F12, CmdToggleBookmarks},
-        {FSHIFT | FCONTROL | FVIRTKEY, VK_SUBTRACT, CmdRotateLeft},
-        {FSHIFT | FCONTROL | FVIRTKEY, VK_OEM_MINUS, CmdRotateLeft},
-        {FSHIFT | FCONTROL | FVIRTKEY, 'T', CmdReopenLastClosedFile},
-        {FCONTROL | FVIRTKEY, VK_NEXT, CmdNextTab},
-        {FCONTROL | FVIRTKEY, VK_PRIOR, CmdPrevTab},
-        {FCONTROL | FSHIFT | FVIRTKEY, 'D', CmdCycleTheme},
+    {0, 'k', CmdScrollUp},
+    {0, 'j', CmdScrollDown},
+    {0, 'h', CmdScrollLeft},
+    {0, 'l', CmdScrollRight},
+    {FVIRTKEY, VK_UP, CmdScrollUp},
+    {FVIRTKEY, VK_DOWN, CmdScrollDown},
+    {FVIRTKEY, VK_LEFT, CmdScrollLeft},
+    {FVIRTKEY, VK_RIGHT, CmdScrollRight},
+
+    {FSHIFT | FVIRTKEY, VK_UP, CmdScrollUpHalfPage},
+    {FSHIFT | FVIRTKEY, VK_DOWN, CmdScrollDownHalfPage},
+
+    {FSHIFT | FVIRTKEY, VK_LEFT, CmdScrollLeftPage},
+    {FSHIFT | FVIRTKEY, VK_RIGHT, CmdScrollRightPage},
+
+    // TODO: maybe CmdGoToNextPage / CmdGoToPrevPage is better
+    {FVIRTKEY, VK_NEXT, CmdScrollDownPage},
+    {FVIRTKEY, VK_PRIOR, CmdScrollUpPage},
+
+    {FVIRTKEY, VK_SPACE, CmdScrollDownPage},
+    {FVIRTKEY, VK_RETURN, CmdScrollDownPage},
+    {FCONTROL | FVIRTKEY, VK_DOWN, CmdScrollDownPage},
+
+    {FSHIFT | FVIRTKEY, VK_SPACE, CmdScrollUpPage},
+    {FSHIFT | FVIRTKEY, VK_RETURN, CmdScrollUpPage},
+    {FCONTROL | FVIRTKEY, VK_UP, CmdScrollUpPage},
+
+    {0, 'n', CmdGoToNextPage},
+    //{FCONTROL | FVIRTKEY, VK_NEXT, CmdGoToNextPage},
+
+    {0, 'p', CmdGoToPrevPage},
+    //{FCONTROL | FVIRTKEY, VK_PRIOR, CmdGoToPrevPage},
+
+    {FVIRTKEY, VK_HOME, CmdGoToFirstPage},
+    {FCONTROL | FVIRTKEY, VK_HOME, CmdGoToFirstPage},
+    {FVIRTKEY, VK_END, CmdGoToLastPage},
+    {FCONTROL | FVIRTKEY, VK_END, CmdGoToLastPage},
+
+    {FVIRTKEY, VK_BACK, CmdNavigateBack},
+    {FALT | FVIRTKEY, VK_LEFT, CmdNavigateBack},
+    {FSHIFT | FVIRTKEY, VK_BACK, CmdNavigateForward},
+    {FALT | FVIRTKEY, VK_RIGHT, CmdNavigateForward},
+
+    {FCONTROL | FVIRTKEY, 'O', CmdOpenFile},
+    {FSHIFT | FCONTROL | FVIRTKEY, VK_RIGHT, CmdOpenNextFileInFolder},
+    {FSHIFT | FCONTROL | FVIRTKEY, VK_LEFT, CmdOpenPrevFileInFolder},
+    {FVIRTKEY, VK_F2, CmdRenameFile},
+    {FCONTROL | FVIRTKEY, 'W', CmdClose},
+    {FCONTROL | FVIRTKEY, 'N', CmdNewWindow},
+    {FSHIFT | FCONTROL | FVIRTKEY, 'N', CmdDuplicateInNewWindow},
+    {FCONTROL | FVIRTKEY, 'S', CmdSaveAs},
+    //{FSHIFT | FCONTROL | FVIRTKEY, 'S', CmdCreateShortcutToFile},
+
+    {FCONTROL | FVIRTKEY, 'A', CmdSelectAll},
+    {FCONTROL | FVIRTKEY, 'B', CmdFavoriteAdd},
+    {FCONTROL | FVIRTKEY, 'C', CmdCopySelection},
+    {FCONTROL | FVIRTKEY, VK_INSERT, CmdCopySelection},
+    {FCONTROL | FVIRTKEY, 'D', CmdProperties},
+    {FCONTROL | FVIRTKEY, 'F', CmdFindFirst},
+    {FCONTROL | FVIRTKEY, 'G', CmdGoToPage},
+    {0, 'g', CmdGoToPage},
+    {FCONTROL | FVIRTKEY, 'K', CmdCommandPalette},
+    {FSHIFT | FCONTROL | FVIRTKEY, 'K', CmdCommandPaletteNoFiles},
+    {FSHIFT | FCONTROL | FVIRTKEY, 'S', CmdSaveAnnotations},
+    {FCONTROL | FVIRTKEY, 'P', CmdPrint},
+    {FCONTROL | FVIRTKEY, 'Q', CmdExit},
+    {FCONTROL | FVIRTKEY, 'Y', CmdZoomCustom},
+    {FCONTROL | FVIRTKEY, '0', CmdZoomFitPage},
+    {FCONTROL | FVIRTKEY, VK_NUMPAD0, CmdZoomFitPage},
+    {FCONTROL | FVIRTKEY, '1', CmdZoomActualSize},
+    {FCONTROL | FVIRTKEY, VK_NUMPAD1, CmdZoomActualSize},
+    {FCONTROL | FVIRTKEY, '2', CmdZoomFitWidth},
+    {FCONTROL | FVIRTKEY, VK_NUMPAD2, CmdZoomFitWidth},
+    {FCONTROL | FVIRTKEY, '3', CmdZoomFitContent},
+    {FCONTROL | FVIRTKEY, VK_NUMPAD3, CmdZoomFitContent},
+    {FCONTROL | FVIRTKEY, VK_ADD, CmdZoomIn},
+    {FCONTROL | FVIRTKEY, VK_SUBTRACT, CmdZoomOut},
+    {FCONTROL | FVIRTKEY, VK_OEM_MINUS, CmdZoomOut},
+    {FCONTROL | FVIRTKEY, '6', CmdSinglePageView},
+    {FCONTROL | FVIRTKEY, VK_NUMPAD6, CmdSinglePageView},
+    {FCONTROL | FVIRTKEY, '7', CmdFacingView},
+    {FCONTROL | FVIRTKEY, VK_NUMPAD7, CmdFacingView},
+    {FCONTROL | FVIRTKEY, '8', CmdBookView},
+    {FCONTROL | FVIRTKEY, VK_NUMPAD8, CmdBookView},
+    {FSHIFT | FCONTROL | FVIRTKEY, VK_ADD, CmdRotateRight},
+    {FCONTROL | FVIRTKEY, VK_OEM_PLUS, CmdZoomIn},
+    {FSHIFT | FCONTROL | FVIRTKEY, VK_OEM_PLUS, CmdRotateRight},
+    {FVIRTKEY, VK_F3, CmdFindNext},
+    {FSHIFT | FVIRTKEY, VK_F3, CmdFindPrev},
+    {FCONTROL | FVIRTKEY, VK_F3, CmdFindNextSel},
+    {FSHIFT | FCONTROL | FVIRTKEY, VK_F3, CmdFindPrevSel},
+    {FCONTROL | FVIRTKEY, VK_F4, CmdClose},
+    {FVIRTKEY, VK_F6, CmdMoveFrameFocus},
+    {FVIRTKEY, VK_F8, CmdToggleToolbar},
+    {FVIRTKEY, VK_F9, CmdToggleMenuBar},
+    {FCONTROL | FVIRTKEY, 'L', CmdTogglePresentationMode},
+    {FVIRTKEY, VK_F5, CmdTogglePresentationMode},
+    {FSHIFT | FVIRTKEY, VK_F11, CmdTogglePresentationMode},
+    {FSHIFT | FCONTROL | FVIRTKEY, 'L', CmdToggleFullscreen},
+    {FVIRTKEY, VK_F11, CmdToggleFullscreen},
+    {FVIRTKEY, VK_F12, CmdToggleBookmarks},
+    {FSHIFT | FVIRTKEY, VK_F12, CmdToggleBookmarks},
+    {FSHIFT | FCONTROL | FVIRTKEY, VK_SUBTRACT, CmdRotateLeft},
+    {FSHIFT | FCONTROL | FVIRTKEY, VK_OEM_MINUS, CmdRotateLeft},
+    {FSHIFT | FCONTROL | FVIRTKEY, 'T', CmdReopenLastClosedFile},
+    {FCONTROL | FVIRTKEY, VK_NEXT, CmdNextTab},
+    {FCONTROL | FVIRTKEY, VK_PRIOR, CmdPrevTab},
+    {FCONTROL | FSHIFT | FVIRTKEY, 'D', CmdCycleTheme},
 
     // need 2 entries for 'a' and 'Shift + a'
     // TODO: maybe add CmdCreateAnnotHighlightAndOpenWindow (kind of clumsy)

diff --git a/src/Commands.h b/src/Commands.h
@@ -170,7 +170,7 @@ Cmd* enum (e.g. CmdOpen) and a human-readable name (not used yet).
     V(CmdReopenLastClosedFile, "Reopen Last Closed")                      \
     V(CmdNextTab, "Next Tab")                                             \
     V(CmdPrevTab, "Previous Tab")                                         \
-    V(CmdCycleTheme, "Switch to next theme")                            \
+    V(CmdCycleTheme, "Switch to next theme")                              \
     V(CmdNone, "Do nothing")
 
 // order of CreateAnnot* must be the same as enum AnnotationType

diff --git a/src/Theme.cpp b/src/Theme.cpp
@@ -330,7 +330,6 @@ void CycleNextTheme() {
     SwitchTheme(currentThemeIndex);
 }
 
-
 Theme* GetThemeByName(char* name) {
     for (int i = 0; i < THEME_COUNT; i++) {
         if (str::Eq(g_themes[i]->name, name)) {

diff --git a/src/Theme.h b/src/Theme.h
@@ -88,11 +88,10 @@ struct Theme {
 extern Theme* currentTheme;
 void CycleNextTheme();
 
-    // Function definitions
+// Function definitions
 Theme* GetThemeByName(char* name);
 Theme* GetThemeByIndex(int index);
 Theme* GetCurrentTheme();
 
 int GetThemeIndex(Theme* theme);
 int GetCurrentThemeIndex();
-
diff --git a/src/wingui/WinGui.cpp b/src/wingui/WinGui.cpp
@@ -3682,7 +3682,8 @@ LRESULT TabsCtrl::WndProc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) {
 
         case WM_MOUSEMOVE: {
             bool isDragging = (GetCapture() == hwnd);
-            // logfa("TabsCtrl::WndProc: WM_MOUSEMOVE, tabUnderMouse: %d, tabHighlited: %d, isDragging: %d\n", tabUnderMouse, tabHighlighted, (int)isDragging);
+            // logfa("TabsCtrl::WndProc: WM_MOUSEMOVE, tabUnderMouse: %d, tabHighlited: %d, isDragging: %d\n",
+            // tabUnderMouse, tabHighlighted, (int)isDragging);
             int hl = tabHighlighted;
             if (isDragging && tabUnderMouse == -1) {
                 // move the tab out: draw it as a image and drag around the screen
@@ -3751,8 +3752,7 @@ LRESULT TabsCtrl::WndProc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) {
         }
 
         case WM_LBUTTONUP: {
-            if (tabBeingClosed != -1 && tabUnderMouse == tabBeingClosed
-                && overClose) {
+            if (tabBeingClosed != -1 && tabUnderMouse == tabBeingClosed && overClose) {
                 // send notification that the tab is closed
                 TriggerTabClosed(this, tabBeingClosed);
                 HwndScheduleRepaint(hwnd);