Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix window resizing/moving issues and add ability to disable vibrancy #727

Merged
merged 9 commits into from
Jan 17, 2019
Merged

Fix window resizing/moving issues and add ability to disable vibrancy #727

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d653e34
Remove the faulty vibrancy workaround.
CvX Jan 16, 2019
70cdc56
Move all vibrancy-related styles to vibrancy.css
CvX Jan 16, 2019
479b950
Change .vibrancy to .full-vibrancy, scope vibrancy-related styles to …
CvX Jan 16, 2019
69c3c66
Move vibrancy-related styles from dark-mode.css to vibrancy.css
CvX Jan 16, 2019
18abaaa
Add three-option vibrancy submenu.
CvX Jan 16, 2019
6cbf9db
Fix menu inconsistencies after config updates.
CvX Jan 16, 2019
69535c9
Linter fixes.
CvX Jan 16, 2019
b14a70c
Migrate existing, boolean-based, vibrancy settings.
CvX Jan 17, 2019
a6f3570
Add a TODO comment to the vibrancy setting.
CvX Jan 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 0 additions & 53 deletions browser.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,56 +399,3 @@ a,
.fbPageBanner {
display: none !important;
}

/* -- Vibrancy-specific styles -- */

html.os-darwin body,
html.os-darwin ._4sp8 {
background: transparent !important;
}

/* Login screen */
html.os-darwin ._3v_o {
background-color: #fff;
}

/* Message placeholder text color */
html.os-darwin ._kmc ._1p1t {
color: #999 !important;
-webkit-text-fill-color: #999 !important;
}

/* Contact list: search input */
html.os-darwin ._5iwm ._58al {
background-color: rgba(246, 247, 249, 0.5) !important;
}

/* Chat title bar (light mode) */
html.os-darwin ._673w {
background-color: #fff !important;
border-bottom: 1px solid rgba(0, 0, 0, 0.1);
}

/* Share previews: title and subtitle */
html.os-darwin .__6k,
html.os-darwin .__6l {
background-color: transparent !important;
}

/* Contact list: person container */
html.os-darwin ._1qt4 {
border-top: solid 1px rgba(0, 0, 0, 0.06);
}

/* Message container + right sidebar (light mode) */
html.os-darwin ._4_j4,
html.os-darwin ._4_j5 {
background: #fff !important;
}

/* New conversation name input field */
html.os-darwin ._2y8y {
background: #fff !important;
}

/* -- End vibrancy-specific styles -- */
26 changes: 18 additions & 8 deletions browser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,11 +163,24 @@ function setDarkMode() {
document.documentElement.classList.toggle('dark-mode', config.get('darkMode'));
}

setVibrancy();
updateVibrancy();
}

function setVibrancy() {
document.documentElement.classList.toggle('vibrancy', config.get('vibrancy'));
function updateVibrancy() {
const {classList} = document.documentElement;

classList.remove('sidebar-vibrancy', 'full-vibrancy');

switch (config.get('vibrancy')) {
case 'sidebar':
classList.add('sidebar-vibrancy');
break;
case 'full':
classList.add('full-vibrancy');
break;
default:
}

ipc.send('set-vibrancy');
}

Expand Down Expand Up @@ -195,11 +208,8 @@ ipc.on('toggle-sidebar', () => {

ipc.on('set-dark-mode', setDarkMode);

ipc.on('toggle-vibrancy', () => {
config.set('vibrancy', !config.get('vibrancy'));
setVibrancy();

document.documentElement.style.backgroundColor = 'transparent';
ipc.on('update-vibrancy', () => {
updateVibrancy();
});

ipc.on('render-overlay-icon', (event, messageCount) => {
Expand Down
29 changes: 26 additions & 3 deletions config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
'use strict';
const Store = require('electron-store');

module.exports = new Store({
const defaults = {
defaults: {
followSystemAppearance: false,
darkMode: false,
vibrancy: false,

// TODO: Change the default to 'sidebar' when the vibrancy issue in Electron is fixed.
// See https://github.com/electron/electron/issues/10420
vibrancy: 'none', // Possible values: 'none', 'sidebar', 'full'
CvX marked this conversation as resolved.
Show resolved Hide resolved

zoomFactor: 1,
lastWindowState: {
width: 800,
Expand All @@ -30,4 +34,23 @@ module.exports = new Store({
quitOnWindowClose: false,
keepMeSignedIn: true
}
});
};

function updateVibrancySetting(store) {
const vibrancy = store.get('vibrancy');

if (vibrancy === true) {
store.set('vibrancy', 'full');
} else if (vibrancy === false) {
store.set('vibrancy', 'sidebar');
}
}

function migrate(store) {
updateVibrancySetting(store);
}

const store = new Store(defaults);
migrate(store);

module.exports = store;
42 changes: 0 additions & 42 deletions dark-mode.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -754,45 +754,3 @@ html.dark-mode ._3v_o ._55r1 {
html.dark-mode ._3v_o ._55r1::-webkit-input-placeholder {
color: var(--base-thirty) !important;
}

/* -- Vibrancy-related styles -- */

/* Chat title bar (dark mode) */
html.os-darwin.dark-mode ._673w {
background-color: var(--container-dark-color) !important;
border-bottom: 1px solid rgba(255, 255, 255, 0.05) !important;
}

/* Styles for vibrancy in dark mode */
html.os-darwin.dark-mode body,
html.os-darwin.dark-mode ._4sp8 {
background: transparent !important;
}

/* Message list: header above */
html.os-darwin.dark-mode ._5742 {
background: transparent !important;
}

/* Contact list: header above */
html.os-darwin.dark-mode ._36ic {
background: transparent !important;
}

/* Message container + right sidebar (dark mode) */
html.os-darwin.dark-mode ._4_j4,
html.os-darwin.dark-mode ._4_j5 {
background: var(--container-dark-color) !important;
}

/* Contact list: search input */
html.os-darwin.dark-mode ._5iwm ._58al {
background: rgba(255, 255, 255, 0.05) !important;
}

/* New conversation name input field */
html.os-darwin.dark-mode ._2y8y {
background: var(--container-dark-color) !important;
}

/* -- End vibrancy-specific styles -- */
10 changes: 3 additions & 7 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const {darkMode, is} = require('electron-util');
const log = require('electron-log');
const {autoUpdater} = require('electron-updater');
const isDev = require('electron-is-dev');
const appMenu = require('./menu');
const updateAppMenu = require('./menu');
const config = require('./config');
const tray = require('./tray');
const {sendAction} = require('./util');
Expand Down Expand Up @@ -194,11 +194,6 @@ function createMainWindow() {
titleBarStyle: 'hiddenInset',
autoHideMenuBar: config.get('autoHideMenuBar'),
darkTheme: isDarkMode, // GTK+3

// Workaround for https://github.com/electron/electron/issues/10420
transparent: true,
backgroundColor: '#00ffffff',

webPreferences: {
preload: path.join(__dirname, 'browser.js'),
nodeIntegration: false,
Expand Down Expand Up @@ -249,7 +244,8 @@ function createMainWindow() {
await app.whenReady();

const trackingUrlPrefix = `https://l.${domain}/l.php`;
electron.Menu.setApplicationMenu(appMenu);

updateAppMenu();
mainWindow = createMainWindow();
tray.create(mainWindow);

Expand Down
Loading