From 8b32811440bdea3e59b5081f13acce3e511f0018 Mon Sep 17 00:00:00 2001
From: Fedor Indutny <79877362+indutny-signal@users.noreply.github.com>
Date: Wed, 15 Jun 2022 11:21:03 -0700
Subject: [PATCH] Add extra pixel to titlebar on Windows 11

---
 .storybook/preview-head.html                 |  3 +
 app/main.ts                                  |  9 ++-
 scripts/esbuild.js                           |  2 +-
 sticker-creator/app/index.scss               |  4 +-
 sticker-creator/app/index.tsx                | 66 +++++++++++++-------
 sticker-creator/components/ConfirmModal.scss |  2 +-
 sticker-creator/index.html                   |  3 +-
 sticker-creator/root.tsx                     |  6 +-
 stylesheets/_global.scss                     | 19 ------
 stylesheets/_titlebar.scss                   | 30 +++++++++
 stylesheets/manifest.scss                    |  1 +
 stylesheets/manifest_bridge.scss             |  1 +
 ts/OS.ts                                     |  4 ++
 ts/components/About.tsx                      |  3 +
 ts/components/App.tsx                        |  3 +
 ts/components/DebugLogWindow.stories.tsx     |  1 +
 ts/components/DebugLogWindow.tsx             |  4 ++
 ts/components/Preferences.stories.tsx        |  1 +
 ts/components/Preferences.tsx                |  3 +
 ts/components/TitleBarContainer.tsx          | 14 ++++-
 ts/set_os_class.ts                           |  3 +
 ts/state/smart/App.tsx                       |  1 +
 ts/windows/about/preload.ts                  |  1 +
 ts/windows/context.ts                        |  6 +-
 ts/windows/debuglog/preload.ts               |  1 +
 ts/windows/settings/preload.ts               |  1 +
 26 files changed, 139 insertions(+), 53 deletions(-)
 create mode 100644 stylesheets/_titlebar.scss

diff --git a/.storybook/preview-head.html b/.storybook/preview-head.html
index a5ed1aa6e..912fcdae2 100644
--- a/.storybook/preview-head.html
+++ b/.storybook/preview-head.html
@@ -30,5 +30,8 @@
       },
       waitForChange: () => {},
     },
+    OS: {
+      isWindows11: () => false,
+    },
   };
 </script>
diff --git a/app/main.ts b/app/main.ts
index fb1a10d62..a5853af23 100644
--- a/app/main.ts
+++ b/app/main.ts
@@ -626,7 +626,7 @@ async function getTitleBarOverlay(): Promise<TitleBarOverlayOptions | false> {
 
     // Should match stylesheets/components/TitleBarContainer.scss minus the
     // border
-    height: 28 - 1,
+    height: (OS.isWindows11() ? 29 : 28) - 1,
   };
 }
 
@@ -1261,7 +1261,8 @@ async function showStickerCreator() {
 
   const { x = 0, y = 0 } = windowConfig || {};
 
-  // TODO: DESKTOP-3670
+  const titleBarOverlay = await getTitleBarOverlay();
+
   const options = {
     x: x + 100,
     y: y + 100,
@@ -1269,6 +1270,8 @@ async function showStickerCreator() {
     minWidth: 800,
     height: 650,
     title: getLocale().i18n('signalDesktopStickerCreator'),
+    titleBarStyle: nonMainTitleBarStyle,
+    titleBarOverlay,
     autoHideMenuBar: true,
     backgroundColor: await getBackgroundColor(),
     show: false,
@@ -1286,7 +1289,7 @@ async function showStickerCreator() {
   stickerCreatorWindow = new BrowserWindow(options);
   setupSpellChecker(stickerCreatorWindow, getLocale());
 
-  handleCommonWindowEvents(stickerCreatorWindow);
+  handleCommonWindowEvents(stickerCreatorWindow, titleBarOverlay);
 
   const appUrl = process.env.SIGNAL_ENABLE_HTTP
     ? prepareUrl(
diff --git a/scripts/esbuild.js b/scripts/esbuild.js
index e4b1aa0ca..cebacaa02 100644
--- a/scripts/esbuild.js
+++ b/scripts/esbuild.js
@@ -80,6 +80,6 @@ esbuild.build({
 esbuild.build({
   ...bundleDefaults,
   mainFields: ['browser', 'main'],
-  entryPoints: [path.join(ROOT_DIR, 'ts/windows/main/preload.ts')],
+  entryPoints: [path.join(ROOT_DIR, 'ts', 'windows', 'main', 'preload.ts')],
   outfile: path.join(ROOT_DIR, 'preload.bundle.js'),
 });
diff --git a/sticker-creator/app/index.scss b/sticker-creator/app/index.scss
index 311888d09..0dd6c01a9 100644
--- a/sticker-creator/app/index.scss
+++ b/sticker-creator/app/index.scss
@@ -6,8 +6,8 @@
 
 .container {
   display: grid;
-  height: 100vh;
-  grid-template-rows: 47px calc(100vh - 47px - 68px) 68px;
+  height: var(--window-height);
+  grid-template-rows: 47px calc(var(--window-height) - 47px - 68px) 68px;
 
   @include light-theme() {
     background-color: $color-white;
diff --git a/sticker-creator/app/index.tsx b/sticker-creator/app/index.tsx
index 4058ffdeb..68c6b503f 100644
--- a/sticker-creator/app/index.tsx
+++ b/sticker-creator/app/index.tsx
@@ -11,31 +11,53 @@ import { ShareStage } from './stages/ShareStage';
 import * as styles from './index.scss';
 import { PageHeader } from '../elements/PageHeader';
 import { useI18n } from '../util/i18n';
+import { TitleBarContainer } from '../../ts/components/TitleBarContainer';
+import type { ExecuteMenuRoleType } from '../../ts/components/TitleBarContainer';
+import { useTheme } from '../../ts/hooks/useTheme';
 
-export const App: React.ComponentType = () => {
+export type AppPropsType = Readonly<{
+  platform: string;
+  executeMenuRole: ExecuteMenuRoleType;
+  isWindows11: boolean;
+}>;
+
+export const App = ({
+  platform,
+  executeMenuRole,
+  isWindows11,
+}: AppPropsType): JSX.Element => {
   const i18n = useI18n();
+  const theme = useTheme();
 
   return (
-    <div className={styles.container}>
-      <PageHeader>{i18n('StickerCreator--title')}</PageHeader>
-      <Switch>
-        <Route path="/drop">
-          <DropStage />
-        </Route>
-        <Route path="/add-emojis">
-          <EmojiStage />
-        </Route>
-        <Route path="/add-meta">
-          <MetaStage />
-        </Route>
-        <Route path="/upload">
-          <UploadStage />
-        </Route>
-        <Route path="/share">
-          <ShareStage />
-        </Route>
-        <Redirect to="/drop" />
-      </Switch>
-    </div>
+    <TitleBarContainer
+      iconSrc="../../images/icon_32.png"
+      platform={platform}
+      isWindows11={isWindows11}
+      theme={theme}
+      executeMenuRole={executeMenuRole}
+    >
+      <div className={styles.container}>
+        <PageHeader>{i18n('StickerCreator--title')}</PageHeader>
+        <Switch>
+          <Route path="/drop">
+            <DropStage />
+          </Route>
+          <Route path="/add-emojis">
+            <EmojiStage />
+          </Route>
+          <Route path="/add-meta">
+            <MetaStage />
+          </Route>
+          <Route path="/upload">
+            <UploadStage />
+          </Route>
+          <Route path="/share">
+            <ShareStage />
+          </Route>
+          <Redirect to="/drop" />
+        </Switch>
+      </div>
+    </TitleBarContainer>
   );
 };
diff --git a/sticker-creator/components/ConfirmModal.scss b/sticker-creator/components/ConfirmModal.scss
index 7e30f69df..0c220f61d 100644
--- a/sticker-creator/components/ConfirmModal.scss
+++ b/sticker-creator/components/ConfirmModal.scss
@@ -4,7 +4,7 @@
 .facade {
   background: rgba(0, 0, 0, 0.33);
   width: 100vw;
-  height: 100vh;
+  height: var(--window-height);
   display: flex;
   justify-content: center;
   align-items: center;
diff --git a/sticker-creator/index.html b/sticker-creator/index.html
index 66d69be14..e5115d817 100644
--- a/sticker-creator/index.html
+++ b/sticker-creator/index.html
@@ -5,7 +5,7 @@
 <html>
   <head>
     <link
-      href="../../node_modules/@indutny/frameless-titlebar/src/title-bar/style.css"
+      href="../../node_modules/@indutny/frameless-titlebar/dist/styles.css"
       rel="stylesheet"
       type="text/css"
     />
@@ -14,6 +14,7 @@
   <body>
     <div id="root"></div>
     <script type="text/javascript" src="../../js/components.js"></script>
+    <script type="text/javascript" src="../../ts/set_os_class.js"></script>
     <script
       type="text/javascript"
       src="../../ts/backbone/backbonejQuery.js"
diff --git a/sticker-creator/root.tsx b/sticker-creator/root.tsx
index aa8729be1..b17489ac0 100644
--- a/sticker-creator/root.tsx
+++ b/sticker-creator/root.tsx
@@ -16,7 +16,11 @@ const ColdRoot = () => (
   <ReduxProvider store={store}>
     <Router history={history}>
       <I18n messages={localeMessages} locale={SignalContext.config.locale}>
-        <App />
+        <App
+          executeMenuRole={SignalContext.executeMenuRole}
+          platform={SignalContext.OS.platform}
+          isWindows11={SignalContext.OS.isWindows11()}
+        />
       </I18n>
     </Router>
   </ReduxProvider>
diff --git a/stylesheets/_global.scss b/stylesheets/_global.scss
index 3d4408775..5306bb3ff 100644
--- a/stylesheets/_global.scss
+++ b/stylesheets/_global.scss
@@ -16,25 +16,6 @@ body {
 
   @include font-body-1;
 
-  // These should match the logic in `ts/types/Settings.ts`'s `getTitleBarVisibility`.
-  //
-  // It'd be great if we could use the `:fullscreen` selector here, but that does not seem
-  //   to work with Electron, at least on macOS.
-  --title-bar-drag-area-height: 0px; // Needs to have a unit to work with `calc()`.
-  --draggable-app-region: initial;
-  &.os-macos:not(.full-screen) {
-    --title-bar-drag-area-height: 28px;
-    --draggable-app-region: drag;
-  }
-
-  --window-height: 100vh;
-  --titlebar-height: 0px;
-
-  &.os-windows:not(.full-screen) {
-    --titlebar-height: 28px;
-    --window-height: calc(100vh - var(--titlebar-height));
-  }
-
   &.light-theme {
     background-color: $color-white;
     color: $color-gray-90;
diff --git a/stylesheets/_titlebar.scss b/stylesheets/_titlebar.scss
new file mode 100644
index 000000000..3cda13aa6
--- /dev/null
+++ b/stylesheets/_titlebar.scss
@@ -0,0 +1,30 @@
+// Copyright 2022 Signal Messenger, LLC
+// SPDX-License-Identifier: AGPL-3.0-only
+
+body {
+  // These should match the logic in `ts/types/Settings.ts`'s `getTitleBarVisibility`.
+  //
+  // It'd be great if we could use the `:fullscreen` selector here, but that does not seem
+  //   to work with Electron, at least on macOS.
+  --title-bar-drag-area-height: 0px; // Needs to have a unit to work with `calc()`.
+  --draggable-app-region: initial;
+  &.os-macos:not(.full-screen) {
+    --title-bar-drag-area-height: 28px;
+    --draggable-app-region: drag;
+  }
+
+  --window-height: 100vh;
+  --titlebar-height: 0px;
+
+  &.os-windows:not(.full-screen) {
+    --titlebar-height: 28px;
+
+    // Account for border eating one pixel out of the titlebar and making it
+    // look unbalanced
+    &.os-windows-11 {
+      --titlebar-height: calc(28px + 1px);
+    }
+
+    --window-height: calc(100vh - var(--titlebar-height));
+  }
+}
diff --git a/stylesheets/manifest.scss b/stylesheets/manifest.scss
index f29c059c9..9c1d18de2 100644
--- a/stylesheets/manifest.scss
+++ b/stylesheets/manifest.scss
@@ -6,6 +6,7 @@
 @import 'variables';
 @import 'mixins';
 @import 'global';
+@import 'titlebar';
 
 // Old style: components
 @import 'progress';
diff --git a/stylesheets/manifest_bridge.scss b/stylesheets/manifest_bridge.scss
index 35c0e7061..fd7a5dfc1 100644
--- a/stylesheets/manifest_bridge.scss
+++ b/stylesheets/manifest_bridge.scss
@@ -6,3 +6,4 @@
 @import 'variables';
 @import 'mixins';
 @import 'modules';
+@import 'titlebar';
diff --git a/ts/OS.ts b/ts/OS.ts
index 73598af01..1049f852e 100644
--- a/ts/OS.ts
+++ b/ts/OS.ts
@@ -16,3 +16,7 @@ export const isWindows = (minVersion?: string): boolean => {
 
   return is.undefined(minVersion) ? true : semver.gte(osRelease, minVersion);
 };
+export const isWindows11 = (): boolean => {
+  // See https://docs.microsoft.com/en-us/answers/questions/586619/windows-11-build-ver-is-still-10022000194.html
+  return isWindows('10.0.22000');
+};
diff --git a/ts/components/About.tsx b/ts/components/About.tsx
index 5b8020394..f79b02861 100644
--- a/ts/components/About.tsx
+++ b/ts/components/About.tsx
@@ -15,6 +15,7 @@ export type PropsType = {
   i18n: LocalizerType;
   version: string;
   platform: string;
+  isWindows11: boolean;
   executeMenuRole: ExecuteMenuRoleType;
 };
 
@@ -24,6 +25,7 @@ export const About = ({
   environment,
   version,
   platform,
+  isWindows11,
   executeMenuRole,
 }: PropsType): JSX.Element => {
   useEscapeHandling(closeAbout);
@@ -33,6 +35,7 @@ export const About = ({
   return (
     <TitleBarContainer
       platform={platform}
+      isWindows11={isWindows11}
       theme={theme}
       executeMenuRole={executeMenuRole}
     >
diff --git a/ts/components/App.tsx b/ts/components/App.tsx
index c0d94eefc..5a78fe564 100644
--- a/ts/components/App.tsx
+++ b/ts/components/App.tsx
@@ -37,6 +37,7 @@ type PropsType = {
   isFullScreen: boolean;
   menuOptions: MenuOptionsType;
   platform: string;
+  isWindows11: boolean;
 
   executeMenuRole: ExecuteMenuRoleType;
   executeMenuAction: (action: MenuActionType) => void;
@@ -54,6 +55,7 @@ export const App = ({
   isShowingStoriesView,
   isMaximized,
   isFullScreen,
+  isWindows11,
   menuOptions,
   platform,
   localeMessages,
@@ -139,6 +141,7 @@ export const App = ({
       isMaximized={isMaximized}
       isFullScreen={isFullScreen}
       platform={platform}
+      isWindows11={isWindows11}
       hasMenu
       localeMessages={localeMessages}
       menuOptions={menuOptions}
diff --git a/ts/components/DebugLogWindow.stories.tsx b/ts/components/DebugLogWindow.stories.tsx
index f300aa1b0..7a424ed4f 100644
--- a/ts/components/DebugLogWindow.stories.tsx
+++ b/ts/components/DebugLogWindow.stories.tsx
@@ -27,6 +27,7 @@ const createProps = (): PropsType => ({
   },
   executeMenuRole: action('executeMenuRole'),
   platform: 'win32',
+  isWindows11: false,
 });
 
 export default {
diff --git a/ts/components/DebugLogWindow.tsx b/ts/components/DebugLogWindow.tsx
index d4228e7a3..ece3b652b 100644
--- a/ts/components/DebugLogWindow.tsx
+++ b/ts/components/DebugLogWindow.tsx
@@ -32,6 +32,7 @@ export type PropsType = {
   fetchLogs: () => Promise<string>;
   uploadLogs: (logs: string) => Promise<string>;
   platform: string;
+  isWindows11: boolean;
   executeMenuRole: ExecuteMenuRoleType;
 };
 
@@ -48,6 +49,7 @@ export const DebugLogWindow = ({
   fetchLogs,
   uploadLogs,
   platform,
+  isWindows11,
   executeMenuRole,
 }: PropsType): JSX.Element => {
   const [loadState, setLoadState] = useState<LoadState>(LoadState.NotStarted);
@@ -146,6 +148,7 @@ export const DebugLogWindow = ({
     return (
       <TitleBarContainer
         platform={platform}
+        isWindows11={isWindows11}
         theme={theme}
         executeMenuRole={executeMenuRole}
       >
@@ -189,6 +192,7 @@ export const DebugLogWindow = ({
   return (
     <TitleBarContainer
       platform={platform}
+      isWindows11={isWindows11}
       theme={theme}
       executeMenuRole={executeMenuRole}
     >
diff --git a/ts/components/Preferences.stories.tsx b/ts/components/Preferences.stories.tsx
index 94cbcfa48..58290e641 100644
--- a/ts/components/Preferences.stories.tsx
+++ b/ts/components/Preferences.stories.tsx
@@ -159,6 +159,7 @@ const createProps = (): PropsType => ({
 
   executeMenuRole: action('executeMenuRole'),
   platform: 'win32',
+  isWindows11: false,
 });
 
 export default {
diff --git a/ts/components/Preferences.tsx b/ts/components/Preferences.tsx
index d37278886..ce6463b2e 100644
--- a/ts/components/Preferences.tsx
+++ b/ts/components/Preferences.tsx
@@ -103,6 +103,7 @@ export type PropsType = {
     }
   ) => unknown;
   platform: string;
+  isWindows11: boolean;
   executeMenuRole: ExecuteMenuRoleType;
 
   // Limited support features
@@ -229,6 +230,7 @@ export const Preferences = ({
   isNotificationAttentionSupported,
   isSyncSupported,
   isSystemTraySupported,
+  isWindows11,
   lastSyncTime,
   makeSyncRequest,
   notificationContent,
@@ -1027,6 +1029,7 @@ export const Preferences = ({
   return (
     <TitleBarContainer
       platform={platform}
+      isWindows11={isWindows11}
       theme={theme}
       executeMenuRole={executeMenuRole}
     >
diff --git a/ts/components/TitleBarContainer.tsx b/ts/components/TitleBarContainer.tsx
index 6b7b33ae7..065d66fed 100644
--- a/ts/components/TitleBarContainer.tsx
+++ b/ts/components/TitleBarContainer.tsx
@@ -27,13 +27,19 @@ export type PropsType = Readonly<{
   theme: ThemeType;
   isMaximized?: boolean;
   isFullScreen?: boolean;
+  isWindows11: boolean;
   platform: string;
   executeMenuRole: ExecuteMenuRoleType;
   titleBarDoubleClick?: () => void;
   children: ReactNode;
+
+  // Needs to be overriden in sticker-creator
+  iconSrc?: string;
 }> &
   (MenuPropsType | { hasMenu?: false });
 
+const TITLEBAR_HEIGHT = 28;
+
 // Windows only
 const ROLE_TO_ACCELERATOR = new Map<
   MenuItemConstructorOptions['role'],
@@ -108,11 +114,13 @@ export const TitleBarContainer = (props: PropsType): JSX.Element => {
     theme,
     isMaximized,
     isFullScreen,
+    isWindows11,
     executeMenuRole,
     titleBarDoubleClick,
     children,
-    platform,
     hasMenu,
+    platform,
+    iconSrc = 'images/icon_32.png',
   } = props;
 
   if (platform !== 'win32' || isFullScreen) {
@@ -151,6 +159,8 @@ export const TitleBarContainer = (props: PropsType): JSX.Element => {
 
   const titleBarTheme = {
     bar: {
+      // See stylesheets/_global.scss
+      height: isWindows11 ? TITLEBAR_HEIGHT + 1 : TITLEBAR_HEIGHT,
       palette:
         theme === ThemeType.light ? ('light' as const) : ('dark' as const),
     },
@@ -168,7 +178,7 @@ export const TitleBarContainer = (props: PropsType): JSX.Element => {
       <TitleBar
         className="TitleBarContainer__title"
         platform={platform}
-        iconSrc="images/icon_32.png"
+        iconSrc={iconSrc}
         theme={titleBarTheme}
         maximized={isMaximized}
         menu={maybeMenu}
diff --git a/ts/set_os_class.ts b/ts/set_os_class.ts
index 297f343e8..6c39dbd77 100644
--- a/ts/set_os_class.ts
+++ b/ts/set_os_class.ts
@@ -5,6 +5,9 @@
   let className: string;
   if (window.SignalContext.OS.isWindows()) {
     className = 'os-windows';
+    if (window.SignalContext.OS.isWindows11()) {
+      document.body.classList.add('os-windows-11');
+    }
   } else if (window.SignalContext.OS.isMacOS()) {
     className = 'os-macos';
   } else if (window.SignalContext.OS.isLinux()) {
diff --git a/ts/state/smart/App.tsx b/ts/state/smart/App.tsx
index 78f548c0e..f9236c7dc 100644
--- a/ts/state/smart/App.tsx
+++ b/ts/state/smart/App.tsx
@@ -41,6 +41,7 @@ const mapStateToProps = (state: StateType) => {
     isFullScreen: getIsMainWindowFullScreen(state),
     menuOptions: getMenuOptions(state),
     platform: getPlatform(state),
+    isWindows11: window.SignalContext.OS.isWindows11(),
     renderCallManager: () => <SmartCallManager />,
     renderCustomizingPreferredReactionsModal: () => (
       <SmartCustomizingPreferredReactionsModal />
diff --git a/ts/windows/about/preload.ts b/ts/windows/about/preload.ts
index 8f407c2c7..a8af3c330 100644
--- a/ts/windows/about/preload.ts
+++ b/ts/windows/about/preload.ts
@@ -34,6 +34,7 @@ contextBridge.exposeInMainWorld('SignalContext', {
         i18n: SignalContext.i18n,
         version: SignalContext.getVersion(),
         platform: process.platform,
+        isWindows11: SignalContext.OS.isWindows11(),
         executeMenuRole: SignalContext.executeMenuRole,
       }),
       document.getElementById('app')
diff --git a/ts/windows/context.ts b/ts/windows/context.ts
index b2f79bc8d..b0f6f7741 100644
--- a/ts/windows/context.ts
+++ b/ts/windows/context.ts
@@ -28,7 +28,7 @@ import { createSetting } from '../util/preload';
 import { initialize as initializeLogging } from '../logging/set_up_renderer_logging';
 import { waitForSettingsChange } from './waitForSettingsChange';
 import { createNativeThemeListener } from '../context/createNativeThemeListener';
-import { isWindows, isLinux, isMacOS } from '../OS';
+import { isWindows, isWindows11, isLinux, isMacOS } from '../OS';
 
 const params = new URLSearchParams(document.location.search);
 const configParam = params.get('config');
@@ -63,7 +63,9 @@ export type SignalContextType = {
     waitForChange: () => Promise<void>;
   };
   OS: {
+    platform: string;
     isWindows: typeof isWindows;
+    isWindows11: typeof isWindows11;
     isLinux: typeof isLinux;
     isMacOS: typeof isMacOS;
   };
@@ -89,7 +91,9 @@ export const SignalContext: SignalContextType = {
     waitForChange: waitForSettingsChange,
   },
   OS: {
+    platform: process.platform,
     isWindows,
+    isWindows11,
     isLinux,
     isMacOS,
   },
diff --git a/ts/windows/debuglog/preload.ts b/ts/windows/debuglog/preload.ts
index 8736ed96e..1877d1cf7 100644
--- a/ts/windows/debuglog/preload.ts
+++ b/ts/windows/debuglog/preload.ts
@@ -24,6 +24,7 @@ contextBridge.exposeInMainWorld('SignalContext', {
     ReactDOM.render(
       React.createElement(DebugLogWindow, {
         platform: process.platform,
+        isWindows11: SignalContext.OS.isWindows11(),
         executeMenuRole: SignalContext.executeMenuRole,
         closeWindow: () => SignalContext.executeMenuRole('close'),
         downloadLog: (logText: string) =>
diff --git a/ts/windows/settings/preload.ts b/ts/windows/settings/preload.ts
index 311f90dba..0508e4839 100644
--- a/ts/windows/settings/preload.ts
+++ b/ts/windows/settings/preload.ts
@@ -339,6 +339,7 @@ const renderPreferences = async () => {
     i18n: SignalContext.i18n,
 
     platform: process.platform,
+    isWindows11: SignalContext.OS.isWindows11(),
     executeMenuRole: SignalContext.executeMenuRole,
   };