From 81522a3b2d358f0748a114e64d6a7912f35d38b8 Mon Sep 17 00:00:00 2001
From: Devin Binnie <52460000+devinbinnie@users.noreply.github.com>
Date: Wed, 17 Jun 2020 14:54:42 -0400
Subject: [PATCH] [MM-22751] Removed Windows 10 style border for non-Windows 10
 clients (#1322)

* [MM-22751] Removed Windows 10 style border for non-Windows 10 clients

* Lint fix
---
 src/browser/components/MainPage.jsx     | 3 ++-
 src/browser/components/SettingsPage.jsx | 4 +++-
 src/main/mainWindow.js                  | 8 +++++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/browser/components/MainPage.jsx b/src/browser/components/MainPage.jsx
index df9ee483..eab682dc 100644
--- a/src/browser/components/MainPage.jsx
+++ b/src/browser/components/MainPage.jsx
@@ -5,6 +5,7 @@
 // This files uses setState().
 /* eslint-disable react/no-set-state */
 
+import os from 'os';
 import url from 'url';
 
 import React, {Fragment} from 'react';
@@ -704,7 +705,7 @@ export default class MainPage extends React.Component {
     }
 
     let titleBarButtons;
-    if (process.platform !== 'darwin') {
+    if (os.platform() === 'win32' && os.release().startsWith('10')) {
       titleBarButtons = (
         <span className='title-bar-btns'>
           <div
diff --git a/src/browser/components/SettingsPage.jsx b/src/browser/components/SettingsPage.jsx
index 6574afba..24016b3e 100644
--- a/src/browser/components/SettingsPage.jsx
+++ b/src/browser/components/SettingsPage.jsx
@@ -5,6 +5,8 @@
 // This file uses setState().
 /* eslint-disable react/no-set-state */
 
+import os from 'os';
+
 import React from 'react';
 import PropTypes from 'prop-types';
 import {Button, Checkbox, Col, FormGroup, Grid, HelpBlock, Navbar, Radio, Row} from 'react-bootstrap';
@@ -540,7 +542,7 @@ export default class SettingsPage extends React.Component {
     }
 
     let titleBarButtons;
-    if (process.platform !== 'darwin') {
+    if (os.platform() === 'win32' && os.release().startsWith('10')) {
       titleBarButtons = (
         <span className='title-bar-btns'>
           <div
diff --git a/src/main/mainWindow.js b/src/main/mainWindow.js
index bd175a7f..3e18dc8c 100644
--- a/src/main/mainWindow.js
+++ b/src/main/mainWindow.js
@@ -3,6 +3,7 @@
 // See LICENSE.txt for license information.
 import fs from 'fs';
 import path from 'path';
+import os from 'os';
 
 import {app, BrowserWindow} from 'electron';
 
@@ -19,6 +20,10 @@ function saveWindowState(file, window) {
   }
 }
 
+function isFramelessWindow() {
+  return os.platform() === 'darwin' || (os.platform() === 'win32' && os.release().startsWith('10'));
+}
+
 function createMainWindow(config, options) {
   const defaultWindowWidth = 1000;
   const defaultWindowHeight = 700;
@@ -51,7 +56,7 @@ function createMainWindow(config, options) {
     show: hideOnStartup || false,
     minWidth: minimumWindowWidth,
     minHeight: minimumWindowHeight,
-    frame: false,
+    frame: !isFramelessWindow(),
     fullscreen: false,
     titleBarStyle: 'hiddenInset',
     backgroundColor: '#fff', // prevents blurry text: https://electronjs.org/docs/faq#the-font-looks-blurry-what-is-this-and-what-can-i-do
@@ -65,6 +70,7 @@ function createMainWindow(config, options) {
 
   const mainWindow = new BrowserWindow(windowOptions);
   mainWindow.deeplinkingUrl = options.deeplinkingUrl;
+  mainWindow.setMenuBarVisibility(false);
 
   const indexURL = global.isDev ? 'http://localhost:8080/browser/index.html' : `file://${app.getAppPath()}/browser/index.html`;
   mainWindow.loadURL(indexURL);