Add "Fit by Orientation" zoom mode (fixes #702)

New zoom level that fits width when the viewport is landscape and fits
page when portrait, re-evaluated on every relayout so it tracks window
resize and screen rotation.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

Author: kjk

cmd/gen-commands.ts

@@ -81,6 +81,7 @@ export const commands = [
     "CmdZoomFitPage", "Zoom: Fit Page",
     "CmdZoomActualSize", "Zoom: Actual Size",
     "CmdZoomFitWidth", "Zoom: Fit Width",
+    "CmdZoomFitByOrientation", "Zoom: Fit Page or Width by Orientation",
     "CmdZoom6400", "Zoom: 6400%",
     "CmdZoom3200", "Zoom: 3200%",
     "CmdZoom1600", "Zoom: 1600%",

cmd/gen-settings.ts

@@ -1180,6 +1180,7 @@ constexpr float kZoomFitPage = -1.F;
 constexpr float kZoomFitWidth = -2.F;
 constexpr float kZoomFitContent = -3.F;
 constexpr float kZoomShrinkToFit = -4.F;
+constexpr float kZoomFitByOrientation = -5.F;
 constexpr float kZoomActualSize = 100.0F;
 constexpr float kZoomMax = 6400.F; /* max zoom in % */
 constexpr float kZoomMin = 8.33F;  /* min zoom in % */

docs/md/Commands.md

@@ -191,6 +191,7 @@ CmdZoomShrinkToFit,,Zoom: Shrink To Fit,"Shows at 100% if page is smaller than v
 CmdZoomFitPage,Ctrl + 0,Zoom: Fit Page,
 CmdZoomFitPageAndSinglePage,,Zoom: Fit Page and Single Page,
 CmdZoomFitWidth,Ctrl + 2,Zoom: Fit Width,
+CmdZoomFitByOrientation,,Zoom: Fit Page or Width by Orientation,"Fit width when the view is wider than tall (landscape), fit page otherwise (portrait); re-evaluated as the window/screen is resized or rotated"
 CmdZoomFitWidthAndContinuous,,Zoom: Fit Width And Continuous,
 CmdZoomIn,Ctrl + Add,Zoom In,
 CmdZoomOut,Ctrl + Subtract,Zoom Out,

docs/md/Version-history.md

@@ -9,6 +9,7 @@ Available in [pre-release](https://www.sumatrapdfreader.org/prerelease) builds.
 - in the Favorites pane and menu, a favorite for a file with a long name now shows your favorite's name first, then the file name, so the name you gave it is no longer pushed out of view (fixes #829, #2236)
 - case-insensitive search now treats German ß as equivalent to `ss`, so searching `Strasse` finds `Straße` and vice versa (fixes #933)
 - hovering a thumbnail on the Frequently Read home page now shows a ✕ button in its top-right corner to remove that document from the list, without going through the right-click menu (fixes #283)
+- new zoom mode `Fit by Orientation` (`CmdZoomFitByOrientation`, in the View / Zoom menu) that automatically fits width when the view is landscape and fits page when portrait, updating as you resize the window or rotate the screen (fixes #702)
 - add cmd-line tools `sumatrapdf-tool.exe <tool> <args>`. Tools: draw, convert, audit, bake, clean, create, extract, info, merge, pages, poster, recolor, show, trim, grep, trace
 - [command palette](Command-Palette.md) has a new `*` mode (`CmdCommandPalette *`, also `CmdCommandPaletteTOC` bound to `Shift + F12`) that jumps to a table of contents entry of the current document. Shows the fully expanded outline, indented by nesting level, with the entry closest to the current page pre-selected (fixes #5676)
 - [command palette](Command-Palette.md) has a new `$` mode (`CmdCommandPalette $`) that jumps to a favorite, listing the current document's favorites first, then favorites of other documents

src/Commands.cpp

@@ -92,6 +92,7 @@ static SeqStrings gCommandNames =
     "CmdZoomFitPage\0"
     "CmdZoomActualSize\0"
     "CmdZoomFitWidth\0"
+    "CmdZoomFitByOrientation\0"
     "CmdZoom6400\0"
     "CmdZoom3200\0"
     "CmdZoom1600\0"
@@ -327,6 +328,7 @@ static i32 gCommandIds[] = {
     CmdZoomFitPage,
     CmdZoomActualSize,
     CmdZoomFitWidth,
+    CmdZoomFitByOrientation,
     CmdZoom6400,
     CmdZoom3200,
     CmdZoom1600,
@@ -562,6 +564,7 @@ SeqStrings gCommandDescriptions =
     "Zoom: Fit Page\0"
     "Zoom: Actual Size\0"
     "Zoom: Fit Width\0"
+    "Zoom: Fit Page or Width by Orientation\0"
     "Zoom: 6400%\0"
     "Zoom: 3200%\0"
     "Zoom: 1600%\0"

src/Commands.h

@@ -87,160 +87,161 @@ enum {
     CmdZoomFitPage = 276,
     CmdZoomActualSize = 277,
     CmdZoomFitWidth = 278,
-    CmdZoom6400 = 279,
-    CmdZoom3200 = 280,
-    CmdZoom1600 = 281,
-    CmdZoom800 = 282,
-    CmdZoom400 = 283,
-    CmdZoom200 = 284,
-    CmdZoom150 = 285,
-    CmdZoom125 = 286,
-    CmdZoom100 = 287,
-    CmdZoom50 = 288,
-    CmdZoom25 = 289,
-    CmdZoom12_5 = 290,
-    CmdZoom8_33 = 291,
-    CmdZoomFitContent = 292,
-    CmdZoomShrinkToFit = 293,
-    CmdZoomCustom = 294,
-    CmdZoomIn = 295,
-    CmdZoomOut = 296,
-    CmdZoomFitWidthAndContinuous = 297,
-    CmdZoomFitPageAndSinglePage = 298,
-    CmdContributeTranslation = 299,
-    CmdOpenWithKnownExternalViewerFirst = 300,
-    CmdOpenWithExplorer = 301,
-    CmdOpenWithDirectoryOpus = 302,
-    CmdOpenWithTotalCommander = 303,
-    CmdOpenWithDoubleCommander = 304,
-    CmdOpenWithAcrobat = 305,
-    CmdOpenWithFoxIt = 306,
-    CmdOpenWithFoxItPhantom = 307,
-    CmdOpenWithPdfXchange = 308,
-    CmdOpenWithXpsViewer = 309,
-    CmdOpenWithHtmlHelp = 310,
-    CmdOpenWithPdfDjvuBookmarker = 311,
-    CmdOpenWithKnownExternalViewerLast = 312,
-    CmdOpenSelectedDocument = 313,
-    CmdPinSelectedDocument = 314,
-    CmdForgetSelectedDocument = 315,
-    CmdExpandAll = 316,
-    CmdCollapseAll = 317,
-    CmdSaveEmbeddedFile = 318,
-    CmdOpenEmbeddedPDF = 319,
-    CmdSaveAttachment = 320,
-    CmdOpenAttachment = 321,
-    CmdOptions = 322,
-    CmdAdvancedOptions = 323,
-    CmdAdvancedSettings = 324,
-    CmdChangeLanguage = 325,
-    CmdCheckUpdate = 326,
-    CmdHelpOpenManual = 327,
-    CmdHelpOpenManualOnWebsite = 328,
-    CmdHelpOpenKeyboardShortcuts = 329,
-    CmdHelpVisitWebsite = 330,
-    CmdHelpAbout = 331,
-    CmdMoveFrameFocus = 332,
-    CmdFavoriteAdd = 333,
-    CmdFavoriteDel = 334,
-    CmdFavoriteToggle = 335,
-    CmdToggleLinks = 336,
-    CmdToggleShowAnnotations = 337,
-    CmdShowAnnotations = 338,
-    CmdHideAnnotations = 339,
-    CmdCreateAnnotText = 340,
-    CmdCreateAnnotLink = 341,
-    CmdCreateAnnotFreeText = 342,
-    CmdCreateAnnotLine = 343,
-    CmdCreateAnnotSquare = 344,
-    CmdCreateAnnotCircle = 345,
-    CmdCreateAnnotPolygon = 346,
-    CmdCreateAnnotPolyLine = 347,
-    CmdCreateAnnotHighlight = 348,
-    CmdCreateAnnotUnderline = 349,
-    CmdCreateAnnotSquiggly = 350,
-    CmdCreateAnnotStrikeOut = 351,
-    CmdCreateAnnotRedact = 352,
-    CmdCreateAnnotStamp = 353,
-    CmdCreateAnnotCaret = 354,
-    CmdCreateAnnotInk = 355,
-    CmdCreateAnnotPopup = 356,
-    CmdCreateAnnotFileAttachment = 357,
-    CmdInvertColors = 358,
-    CmdTogglePageInfo = 359,
-    CmdToggleZoom = 360,
-    CmdNavigateBack = 361,
-    CmdNavigateForward = 362,
-    CmdToggleCursorPosition = 363,
-    CmdOpenNextFileInFolder = 364,
-    CmdOpenPrevFileInFolder = 365,
-    CmdCommandPalette = 366,
-    CmdShowLog = 367,
-    CmdShowErrors = 368,
-    CmdClearHistory = 369,
-    CmdReopenLastClosedFile = 370,
-    CmdNextTab = 371,
-    CmdPrevTab = 372,
-    CmdNextTabSmart = 373,
-    CmdPrevTabSmart = 374,
-    CmdMoveTabLeft = 375,
-    CmdMoveTabRight = 376,
-    CmdSelectNextTheme = 377,
-    CmdToggleFrequentlyRead = 378,
-    CmdInvokeInverseSearch = 379,
-    CmdExec = 380,
-    CmdViewWithExternalViewer = 381,
-    CmdSelectionHandler = 382,
-    CmdSetTheme = 383,
-    CmdToggleInverseSearch = 384,
-    CmdDebugCorruptMemory = 385,
-    CmdDebugCrashMe = 386,
-    CmdDebugDownloadSymbols = 387,
-    CmdDebugTestApp = 388,
-    CmdDebugShowNotif = 389,
-    CmdDebugStartStressTest = 390,
-    CmdDebugTogglePredictiveRender = 391,
-    CmdDebugToggleRtl = 392,
-    CmdToggleAntiAlias = 393,
-    CmdToggleSmoothScroll = 394,
-    CmdToggleScrollbarInSinglePage = 395,
-    CmdToggleLazyLoading = 396,
-    CmdToggleEscToExit = 397,
-    CmdListPrinters = 398,
-    CmdToggleWindowsPreviewer = 399,
-    CmdToggleWindowsSearchFilter = 400,
-    CmdScreenshot = 401,
-    CmdCropImage = 402,
-    CmdResizeImage = 403,
-    CmdSaveImage = 404,
-    CmdPasteClipboardImage = 405,
-    CmdTabGroupSave = 406,
-    CmdTabGroupRestore = 407,
-    CmdToggleTips = 408,
-    CmdChangeBackgroundColor = 409,
-    CmdSetTabColor = 410,
-    CmdPdfCompress = 411,
-    CmdPdfDecompress = 412,
-    CmdPdfDeletePages = 413,
-    CmdPdfExtractPages = 414,
-    CmdPdfEncrypt = 415,
-    CmdPdfDecrypt = 416,
-    CmdPdfBake = 417,
-    CmdPdShowInfo = 418,
-    CmdDocumentExtractText = 419,
-    CmdDocumentShowOutline = 420,
-    CmdSetScreenshotHotkey = 421,
-    CmdToggleReuseInstance = 422,
-    CmdToggleChmUI = 423,
-    CmdReadAloud = 424,
-    CmdPauseReadAloud = 425,
-    CmdContinueReadAloud = 426,
-    CmdToggleHoverPreview = 427,
-    CmdRemoveDeletedFilesFromHistory = 428,
-    CmdCommandPaletteTOC = 429,
-    CmdDebugToggleRenderInfo = 430,
-    CmdConvertImageToPdf = 431,
-    CmdNone = 432,
+    CmdZoomFitByOrientation = 279,
+    CmdZoom6400 = 280,
+    CmdZoom3200 = 281,
+    CmdZoom1600 = 282,
+    CmdZoom800 = 283,
+    CmdZoom400 = 284,
+    CmdZoom200 = 285,
+    CmdZoom150 = 286,
+    CmdZoom125 = 287,
+    CmdZoom100 = 288,
+    CmdZoom50 = 289,
+    CmdZoom25 = 290,
+    CmdZoom12_5 = 291,
+    CmdZoom8_33 = 292,
+    CmdZoomFitContent = 293,
+    CmdZoomShrinkToFit = 294,
+    CmdZoomCustom = 295,
+    CmdZoomIn = 296,
+    CmdZoomOut = 297,
+    CmdZoomFitWidthAndContinuous = 298,
+    CmdZoomFitPageAndSinglePage = 299,
+    CmdContributeTranslation = 300,
+    CmdOpenWithKnownExternalViewerFirst = 301,
+    CmdOpenWithExplorer = 302,
+    CmdOpenWithDirectoryOpus = 303,
+    CmdOpenWithTotalCommander = 304,
+    CmdOpenWithDoubleCommander = 305,
+    CmdOpenWithAcrobat = 306,
+    CmdOpenWithFoxIt = 307,
+    CmdOpenWithFoxItPhantom = 308,
+    CmdOpenWithPdfXchange = 309,
+    CmdOpenWithXpsViewer = 310,
+    CmdOpenWithHtmlHelp = 311,
+    CmdOpenWithPdfDjvuBookmarker = 312,
+    CmdOpenWithKnownExternalViewerLast = 313,
+    CmdOpenSelectedDocument = 314,
+    CmdPinSelectedDocument = 315,
+    CmdForgetSelectedDocument = 316,
+    CmdExpandAll = 317,
+    CmdCollapseAll = 318,
+    CmdSaveEmbeddedFile = 319,
+    CmdOpenEmbeddedPDF = 320,
+    CmdSaveAttachment = 321,
+    CmdOpenAttachment = 322,
+    CmdOptions = 323,
+    CmdAdvancedOptions = 324,
+    CmdAdvancedSettings = 325,
+    CmdChangeLanguage = 326,
+    CmdCheckUpdate = 327,
+    CmdHelpOpenManual = 328,
+    CmdHelpOpenManualOnWebsite = 329,
+    CmdHelpOpenKeyboardShortcuts = 330,
+    CmdHelpVisitWebsite = 331,
+    CmdHelpAbout = 332,
+    CmdMoveFrameFocus = 333,
+    CmdFavoriteAdd = 334,
+    CmdFavoriteDel = 335,
+    CmdFavoriteToggle = 336,
+    CmdToggleLinks = 337,
+    CmdToggleShowAnnotations = 338,
+    CmdShowAnnotations = 339,
+    CmdHideAnnotations = 340,
+    CmdCreateAnnotText = 341,
+    CmdCreateAnnotLink = 342,
+    CmdCreateAnnotFreeText = 343,
+    CmdCreateAnnotLine = 344,
+    CmdCreateAnnotSquare = 345,
+    CmdCreateAnnotCircle = 346,
+    CmdCreateAnnotPolygon = 347,
+    CmdCreateAnnotPolyLine = 348,
+    CmdCreateAnnotHighlight = 349,
+    CmdCreateAnnotUnderline = 350,
+    CmdCreateAnnotSquiggly = 351,
+    CmdCreateAnnotStrikeOut = 352,
+    CmdCreateAnnotRedact = 353,
+    CmdCreateAnnotStamp = 354,
+    CmdCreateAnnotCaret = 355,
+    CmdCreateAnnotInk = 356,
+    CmdCreateAnnotPopup = 357,
+    CmdCreateAnnotFileAttachment = 358,
+    CmdInvertColors = 359,
+    CmdTogglePageInfo = 360,
+    CmdToggleZoom = 361,
+    CmdNavigateBack = 362,
+    CmdNavigateForward = 363,
+    CmdToggleCursorPosition = 364,
+    CmdOpenNextFileInFolder = 365,
+    CmdOpenPrevFileInFolder = 366,
+    CmdCommandPalette = 367,
+    CmdShowLog = 368,
+    CmdShowErrors = 369,
+    CmdClearHistory = 370,
+    CmdReopenLastClosedFile = 371,
+    CmdNextTab = 372,
+    CmdPrevTab = 373,
+    CmdNextTabSmart = 374,
+    CmdPrevTabSmart = 375,
+    CmdMoveTabLeft = 376,
+    CmdMoveTabRight = 377,
+    CmdSelectNextTheme = 378,
+    CmdToggleFrequentlyRead = 379,
+    CmdInvokeInverseSearch = 380,
+    CmdExec = 381,
+    CmdViewWithExternalViewer = 382,
+    CmdSelectionHandler = 383,
+    CmdSetTheme = 384,
+    CmdToggleInverseSearch = 385,
+    CmdDebugCorruptMemory = 386,
+    CmdDebugCrashMe = 387,
+    CmdDebugDownloadSymbols = 388,
+    CmdDebugTestApp = 389,
+    CmdDebugShowNotif = 390,
+    CmdDebugStartStressTest = 391,
+    CmdDebugTogglePredictiveRender = 392,
+    CmdDebugToggleRtl = 393,
+    CmdToggleAntiAlias = 394,
+    CmdToggleSmoothScroll = 395,
+    CmdToggleScrollbarInSinglePage = 396,
+    CmdToggleLazyLoading = 397,
+    CmdToggleEscToExit = 398,
+    CmdListPrinters = 399,
+    CmdToggleWindowsPreviewer = 400,
+    CmdToggleWindowsSearchFilter = 401,
+    CmdScreenshot = 402,
+    CmdCropImage = 403,
+    CmdResizeImage = 404,
+    CmdSaveImage = 405,
+    CmdPasteClipboardImage = 406,
+    CmdTabGroupSave = 407,
+    CmdTabGroupRestore = 408,
+    CmdToggleTips = 409,
+    CmdChangeBackgroundColor = 410,
+    CmdSetTabColor = 411,
+    CmdPdfCompress = 412,
+    CmdPdfDecompress = 413,
+    CmdPdfDeletePages = 414,
+    CmdPdfExtractPages = 415,
+    CmdPdfEncrypt = 416,
+    CmdPdfDecrypt = 417,
+    CmdPdfBake = 418,
+    CmdPdShowInfo = 419,
+    CmdDocumentExtractText = 420,
+    CmdDocumentShowOutline = 421,
+    CmdSetScreenshotHotkey = 422,
+    CmdToggleReuseInstance = 423,
+    CmdToggleChmUI = 424,
+    CmdReadAloud = 425,
+    CmdPauseReadAloud = 426,
+    CmdContinueReadAloud = 427,
+    CmdToggleHoverPreview = 428,
+    CmdRemoveDeletedFilesFromHistory = 429,
+    CmdCommandPaletteTOC = 430,
+    CmdDebugToggleRenderInfo = 431,
+    CmdConvertImageToPdf = 432,
+    CmdNone = 433,
 
     /* range for file history */
     CmdFileHistoryFirst,