Windows title bar fixes and custom per-platform styling to keep origi…

…nal behaviour.
inkle · May 17, 2024 · 0b8814b · 0b8814b
1 parent 507174a
commit 0b8814b
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 9 deletions.
diff --git a/app/main-process/projectWindow.js b/app/main-process/projectWindow.js
@@ -8,13 +8,11 @@ const Inklecate = require("./inklecate.js").Inklecate;
 const Menu = electron.Menu;
 const i18n = require("./i18n/i18n.js");
 
-const electronWindowOptions = {
+var electronWindowOptions = {
   width: 1300,
   height: 730,
   minWidth: 350,
   minHeight: 250,
-  titleBarStyle: 'hidden',
-  titleBarOverlay: true,
   webPreferences: {
     preload: path.join(__dirname, '..', 'renderer', 'preload.js'),
     nodeIntegration: true,
@@ -23,6 +21,12 @@ const electronWindowOptions = {
 
 };
 
+
+if( process.platform == "darwin" ) {
+    electronWindowOptions.titleBarStyle = 'hidden';
+    electronWindowOptions.titleBarOverlay = true;
+}
+
 var windows = [];
 
 const recentFilesPath = path.join(electron.app.getPath("userData"), "recent-files.json");
@@ -365,4 +369,9 @@ ipc.on("project-settings-needs-reload", (event, rootInkFilePath) => {
     win.refreshProjectSettings(rootInkFilePath);
 });
 
+ipc.on("set-native-window-title", (event, newWindowTitle) => {
+    var win = ProjectWindow.withWebContents(event.sender);
+    win.browserWindow.title = newWindowTitle;
+});
+
 exports.ProjectWindow = ProjectWindow;
diff --git a/app/renderer/controller.js b/app/renderer/controller.js
@@ -276,7 +276,12 @@ ToolbarView.setEvents({
         PlayerView.previewStepBack();
         LiveCompiler.stepBack();
     },
-    rewind:   () => { LiveCompiler.rewind(); }
+    rewind:   () => { LiveCompiler.rewind(); },
+    didSetTitle: (title) => {
+        if( process.platform == "win32" ) {
+            ipc.send("set-native-window-title", title);
+        }
+    }
 });
 
 NavView.setEvents({

diff --git a/app/renderer/index.html b/app/renderer/index.html
@@ -5,7 +5,8 @@
 
     <script>
       // Add the platform name as a class on the root HTML element for custom CSS
-      //document.getElementsByTagName("html")[0].classList.add(process.platform);
+      // platform is a variable exposed in preload.js
+      document.getElementsByTagName("html")[0].classList.add(platform);
     </script>
 
   </head>

diff --git a/app/renderer/main.css b/app/renderer/main.css
@@ -73,8 +73,8 @@ h1.title {
 }
 
 .win32 #toolbar, .linux #toolbar {
-  height: 30px;
-  background: #f0f0f0;
+  height: 34px;
+  background: white;
 }
 
 .win32 h1.title, .linux h1.title {
@@ -516,7 +516,7 @@ img.issue-icon.warning {
 }
 
 .win32 #main, .linux #main {
-  top: 30px;
+  top: 34px;
 }
 
 #editor {

diff --git a/app/renderer/preload.js b/app/renderer/preload.js
@@ -11,3 +11,5 @@ window.addEventListener('DOMContentLoaded', () => {
         });
     });
 });
+
+window.platform = process.platform;
diff --git a/app/renderer/toolbarView.js b/app/renderer/toolbarView.js
@@ -5,7 +5,8 @@ const i18n = require("./i18n.js");
 var events = {
     rewind:   () => {},
     stepBack: () => {},
-    selectIssue: () => {}
+    selectIssue: () => {},
+    didSetTitle: () => {}
 };
 
 function updateIssueSummary(issues, issueClickCallback) {
@@ -157,6 +158,7 @@ $(document).ready(function() {
 
 function setTitle(title) {
     $("h1.title").text(title);
+    events.didSetTitle(title);
 }
 
 function setBusySpinnerVisible(vis) {