Desktop: stop the content view from outgrowing its window

electron/desktopWindow.js

@@ -744,12 +744,19 @@ export class DesktopWindowManager {
       return { action: 'deny' };
     });
 
-    this.mainWindow.on('resize', () => {
-      this.viewHost.resizeActiveView();
-      this.syncSettingsWindowBounds();
-    });
+    // Every way the content area can change size. 'resize' alone misses a
+    // move to a screen with a different scaling factor, and maximising does
+    // not reliably report its final size through 'resize' either - the view
+    // then keeps the old width and the page hangs over the right edge.
+    for (const event of ['resize', 'maximize', 'unmaximize', 'enter-full-screen', 'leave-full-screen']) {
+      this.mainWindow.on(event, () => {
+        this.viewHost.resizeActiveView();
+        this.syncSettingsWindowBounds();
+      });
+    }
 
     this.mainWindow.on('move', () => {
+      this.viewHost.resizeActiveView();
       this.syncSettingsWindowBounds();
     });
 

electron/viewHost.js

@@ -228,8 +228,12 @@ export class ViewHost {
     } catch {
       return;
     }
+    // No setAutoResize here. It grows the view along with the window on its
+    // own, and `resizeActiveView` below already sets the bounds on every
+    // resize - the two together let the view end up wider than the window,
+    // which cuts the page off at the right edge with no scrollbar to hint at
+    // it. Setting the bounds by hand covers every case setAutoResize would.
     view.setBounds(this.getContentViewBounds());
-    view.setAutoResize({ width: true, height: true });
   }
 
   resizeActiveView() {