Fix blank sticker creator window on windows/linux

This commit is contained in:
Scott Nonnenberg
2019-12-18 07:13:36 -08:00
committed by Ken Powers
parent 56df4163b3
commit 363a7dd179
3 changed files with 14 additions and 9 deletions

View File

@@ -265,7 +265,7 @@
"bundleVersion": "1" "bundleVersion": "1"
}, },
"win": { "win": {
"asarUnpack": "node_modules/spellchecker/vendor/hunspell_dictionaries", "asarUnpack": ["node_modules/spellchecker/vendor/hunspell_dictionaries", "node_modules/sharp"],
"artifactName": "${name}-win-${version}.${ext}", "artifactName": "${name}-win-${version}.${ext}",
"certificateSubjectName": "Signal", "certificateSubjectName": "Signal",
"publisherName": "Signal (Quiet Riddle Ventures, LLC)", "publisherName": "Signal (Quiet Riddle Ventures, LLC)",
@@ -298,7 +298,7 @@
"desktop": { "desktop": {
"StartupWMClass": "Signal" "StartupWMClass": "Signal"
}, },
"asarUnpack": "node_modules/spellchecker/vendor/hunspell_dictionaries", "asarUnpack": ["node_modules/spellchecker/vendor/hunspell_dictionaries", "node_modules/sharp"],
"target": [ "target": [
"deb" "deb"
], ],

View File

@@ -1,10 +1,8 @@
import * as React from 'react'; import * as React from 'react';
import { render } from 'react-dom'; import { render } from 'react-dom';
import { Root } from './root'; import { Root } from './root';
import { preloadImages } from '../ts/components/emoji/lib';
const root = document.getElementById('root'); const root = document.getElementById('root');
console.log('Sticker Creator: Starting root');
render(<Root />, root); render(<Root />, root);
preloadImages();

View File

@@ -20,6 +20,9 @@ window.getGuid = require('uuid/v4');
window.localeMessages = ipc.sendSync('locale-data'); window.localeMessages = ipc.sendSync('locale-data');
require('../js/logging'); require('../js/logging');
window.log.info('sticker-creator starting up...');
const Signal = require('../js/modules/signal'); const Signal = require('../js/modules/signal');
window.Signal = Signal.setup({}); window.Signal = Signal.setup({});
@@ -153,7 +156,11 @@ async function applyTheme() {
window.addEventListener('DOMContentLoaded', applyTheme); window.addEventListener('DOMContentLoaded', applyTheme);
systemPreferences.subscribeNotification( if (systemPreferences && systemPreferences.subscribeNotification) {
'AppleInterfaceThemeChangedNotification', systemPreferences.subscribeNotification(
applyTheme 'AppleInterfaceThemeChangedNotification',
); applyTheme
);
}
window.log.info('sticker-creator preload complete...');