Home Explore 引导页 在线工具 Blog
Register Sign In
Pchen0
/
electron
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

docs: Update the macos Dock Instructions (#29220)

* Update the macos Dock Instructions

* Remove preload and ;'s

* Mixed ;s

* Update dock doc

* Add informational text to index.html

Co-authored-by: Tony Ferrell <[email protected]>
trop[bot] 3 years ago
parent
daa075d020
commit
119ce7d6da
3 changed files with 31 additions and 14 deletions
Split View Show Diff Stats
  1. 1 5
      docs/fiddles/features/macos-dock-menu/index.html
  2. 3 4
      docs/fiddles/features/macos-dock-menu/main.js
  3. 27 5
      docs/tutorial/macos-dock.md

+ 1 - 5
docs/fiddles/features/macos-dock-menu/index.html
View File 

@@ -7,10 +7,6 @@
 
 </head>
 
 <body>
 
     <h1>Hello World!</h1>
 
-    <p>
 
-        We are using node <script>document.write(process.versions.node)</script>,
 
-        Chrome <script>document.write(process.versions.chrome)</script>,
 
-        and Electron <script>document.write(process.versions.electron)</script>.
 
-    </p>
 
+    <p>Right click the dock icon to see the custom menu options.</p>
 
 </body>
 
 </html>

+ 3 - 4
docs/fiddles/features/macos-dock-menu/main.js
View File 

@@ -4,9 +4,6 @@ function createWindow () {
 
   const win = new BrowserWindow({
 
     width: 800,
 
     height: 600,
 
-    webPreferences: {
 
-      nodeIntegration: true
 
-    }
 
   })
 
 
   win.loadFile('index.html')
 
@@ -27,7 +24,9 @@ const dockMenu = Menu.buildFromTemplate([
 
 ])
 
 
 app.whenReady().then(() => {
 
-  app.dock.setMenu(dockMenu)
 
+  if (process.platform === 'darwin') {
 
+    app.dock.setMenu(dockMenu)
 
+  }
 
 }).then(createWindow)
 
 
 app.on('window-all-closed', () => {

+ 27 - 5
docs/tutorial/macos-dock.md
View File 

@@ -1,6 +1,4 @@
 
-# macOS Dock
 
-
 
-## Overview
 
+# Configuring the macOS Dock
 
 
 Electron has APIs to configure the app's icon in the macOS Dock. A macOS-only
 
 API exists to create a custom dock menu, but Electron also uses the app dock
 
@@ -25,7 +23,16 @@ Starting with a working application from the
 
  following lines:
 
 
 ```javascript fiddle='docs/fiddles/features/macos-dock-menu'
 
-const { app, Menu } = require('electron')
 
+const { app, BrowserWindow, Menu } = require('electron')
 
+
 
+function createWindow () {
 
+  const win = new BrowserWindow({
 
+    width: 800,
 
+    height: 600,
 
+  })
 
+
 
+  win.loadFile('index.html')
 
+}
 
 
 const dockMenu = Menu.buildFromTemplate([
 
   {
 
@@ -42,8 +49,23 @@ const dockMenu = Menu.buildFromTemplate([
 
 ])
 
 
 app.whenReady().then(() => {
 
-  app.dock.setMenu(dockMenu)
 
+  if (process.platform === 'darwin') {
 
+    app.dock.setMenu(dockMenu)
 
+  }
 
+}).then(createWindow)
 
+
 
+app.on('window-all-closed', () => {
 
+  if (process.platform !== 'darwin') {
 
+    app.quit()
 
+  }
 
 })
 
+
 
+app.on('activate', () => {
 
+  if (BrowserWindow.getAllWindows().length === 0) {
 
+    createWindow()
 
+  }
 
+})
 
+
 
 ```
 
 
 After launching the Electron application, right click the application icon.