Mastodon
/
hyperspace-desktop-client-windows-linux-macos
mirror of https://github.com/hyperspacedev/hyperspace
1
0
Fork 0
Code Issues Releases Wiki Activity

Fluidly change vibrancy

This commit is contained in:
Marquis Kurt 2019-05-17 13:02:48 -04:00
parent 87dc9b8ba2
commit 647474b9b7
2 changed files with 31 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
public/electron.js
View File

@ -21,6 +21,13 @@ protocol.registerSchemesAsPrivileged([
{ scheme: 'hyperspace', privileges: { standard: true, secure: true } } { scheme: 'hyperspace', privileges: { standard: true, secure: true } }
]) ])
/**
* Determine whether the desktop app is on macOS
*/
function darwin() {
return process.platform === "darwin";
}
/** /**
* Register the protocol for Hyperspace * Register the protocol for Hyperspace
*/ */
@ -126,7 +133,9 @@ function createWindow() {
// Set some preferences that are specific to macOS. // Set some preferences that are specific to macOS.
titleBarStyle: 'hidden', titleBarStyle: 'hidden',
vibrancy: systemPreferences.isDarkMode()? "dark": "light" vibrancy: systemPreferences.isDarkMode()? "ultra-dark": "light",
transparent: darwin(),
backgroundColor: darwin()? "#80FFFFFF": "#FFF"
} }
); );
@ -138,8 +147,10 @@ function createWindow() {
// Watch for a change in macOS's dark mode and reload the window to apply changes // Watch for a change in macOS's dark mode and reload the window to apply changes
systemPreferences.subscribeNotification('AppleInterfaceThemeChangedNotification', () => { systemPreferences.subscribeNotification('AppleInterfaceThemeChangedNotification', () => {
if (mainWindow != null) if (mainWindow != null) {
mainWindow.setVibrancy(systemPreferences.isDarkMode()? "ultra-dark": "light");
mainWindow.webContents.reload(); mainWindow.webContents.reload();
}
}) })
// Delete the window when closed // Delete the window when closed
@ -199,18 +210,18 @@ function createMenubar() {
submenu: [ submenu: [
{ role: 'reload' }, { role: 'reload' },
{ role: 'forcereload' }, { role: 'forcereload' },
// { {
// label: 'Open Dev Tools', label: 'Open Dev Tools',
// click () { click () {
// try { try {
// mainWindow.webContents.openDevTools({mode: 'undocked'}); mainWindow.webContents.openDevTools({mode: 'undocked'});
// } catch (err) { } catch (err) {
// console.error("Couldn't open dev tools: " + err); console.error("Couldn't open dev tools: " + err);
// } }
// }, },
// accelerator: 'Shift+CmdOrCtrl+I' accelerator: 'Shift+CmdOrCtrl+I'
// }, },
{ type: 'separator' }, { type: 'separator' },
{ role: 'togglefullscreen' } { role: 'togglefullscreen' }
] ]
@ -285,7 +296,7 @@ app.on('ready', () => {
// Standard quit behavior changes for macOS // Standard quit behavior changes for macOS
app.on('window-all-closed', () => { app.on('window-all-closed', () => {
if (process.platform !== 'darwin') { if (!darwin()) {
app.quit() app.quit()
} }
}); });

7
src/components/AppLayout/AppLayout.styles.tsx
View File

@ -1,4 +1,5 @@
import { Theme, createStyles } from "@material-ui/core"; import { Theme, createStyles } from "@material-ui/core";
import { darken } from "@material-ui/core/styles/colorManipulator";
import { isDarwinApp } from '../../utilities/desktop'; import { isDarwinApp } from '../../utilities/desktop';
import { fade } from "@material-ui/core/styles/colorManipulator"; import { fade } from "@material-ui/core/styles/colorManipulator";
@ -36,7 +37,11 @@ export const styles = (theme: Theme) => createStyles({
appBar: { appBar: {
zIndex: 1000, zIndex: 1000,
backgroundImage: isDarwinApp()? `linear-gradient(${theme.palette.primary.main}, ${theme.palette.primary.dark})`: undefined, backgroundImage: isDarwinApp()? `linear-gradient(${theme.palette.primary.main}, ${theme.palette.primary.dark})`: undefined,
backgroundColor: theme.palette.primary.main backgroundColor: theme.palette.primary.main,
borderBottomColor: darken(theme.palette.primary.dark, 0.2),
borderBottomWidth: 1,
borderBottomStyle: isDarwinApp()? "solid": "none",
boxShadow: isDarwinApp()? "none": "inherit"
}, },
appBarMenuButton: { appBarMenuButton: {
marginLeft: -12, marginLeft: -12,