16mm
/
mcopy
1
0
Fork 0
Code Issues 14 Pull Requests Projects 2 Releases 13 Wiki Activity

Give macOS an extra 300ms to open and fullscreen a webview

This commit is contained in:
mmcwilliams 2019-06-26 16:09:14 -04:00
parent f8fc9fded6
commit 45f96e6537
7 changed files with 33 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/lib/display/index.js
View File

@ -17,7 +17,7 @@ function padded_frame(i) {
return str; return str;
} }
class WebView { class WebView {
constructor() { constructor(platform) {
this.opened = false; this.opened = false;
this.showing = false; this.showing = false;
this.digitalWindow = new BrowserWindow({ this.digitalWindow = new BrowserWindow({
@ -39,7 +39,8 @@ class WebView {
this.digitalWindow = null; this.digitalWindow = null;
this.close(); this.close();
}); });
this.digitalWindow.hide(); //this.digitalWindow.hide();
this.platform = platform;
} }
async open() { async open() {
this.digitalWindow.show(); this.digitalWindow.show();
@ -47,6 +48,9 @@ class WebView {
this.opened = true; this.opened = true;
await this.digitalWindow.setFullScreen(true); await this.digitalWindow.setFullScreen(true);
await delay_1.delay(300); await delay_1.delay(300);
if (this.platform === 'osx') {
await delay_1.delay(300); //give macs an extra 300ms to open fullscreen
}
} }
async show(src) { async show(src) {
if (!this.digitalWindow) { if (!this.digitalWindow) {
@ -150,7 +154,7 @@ class Display {
async open() { async open() {
//if (this.platform !== 'nix') { //if (this.platform !== 'nix') {
if (!this.wv || !this.wv.opened) { if (!this.wv || !this.wv.opened) {
this.wv = new WebView(); this.wv = new WebView(this.platform);
await this.wv.open(); await this.wv.open();
} }
//} else { //} else {

2
app/lib/display/index.js.map
View File

File diff suppressed because one or more lines are too long

10
cli/lib/display/index.js
View File

@ -17,7 +17,7 @@ function padded_frame(i) {
return str; return str;
} }
class WebView { class WebView {
constructor() { constructor(platform) {
this.opened = false; this.opened = false;
this.showing = false; this.showing = false;
this.digitalWindow = new BrowserWindow({ this.digitalWindow = new BrowserWindow({
@ -39,7 +39,8 @@ class WebView {
this.digitalWindow = null; this.digitalWindow = null;
this.close(); this.close();
}); });
this.digitalWindow.hide(); //this.digitalWindow.hide();
this.platform = platform;
} }
async open() { async open() {
this.digitalWindow.show(); this.digitalWindow.show();
@ -47,6 +48,9 @@ class WebView {
this.opened = true; this.opened = true;
await this.digitalWindow.setFullScreen(true); await this.digitalWindow.setFullScreen(true);
await delay_1.delay(300); await delay_1.delay(300);
if (this.platform === 'osx') {
await delay_1.delay(300); //give macs an extra 300ms to open fullscreen
}
} }
async show(src) { async show(src) {
if (!this.digitalWindow) { if (!this.digitalWindow) {
@ -150,7 +154,7 @@ class Display {
async open() { async open() {
//if (this.platform !== 'nix') { //if (this.platform !== 'nix') {
if (!this.wv || !this.wv.opened) { if (!this.wv || !this.wv.opened) {
this.wv = new WebView(); this.wv = new WebView(this.platform);
await this.wv.open(); await this.wv.open();
} }
//} else { //} else {

2
cli/lib/display/index.js.map
View File

File diff suppressed because one or more lines are too long

10
lib/display/index.js
View File

@ -17,7 +17,7 @@ function padded_frame(i) {
return str; return str;
} }
class WebView { class WebView {
constructor() { constructor(platform) {
this.opened = false; this.opened = false;
this.showing = false; this.showing = false;
this.digitalWindow = new BrowserWindow({ this.digitalWindow = new BrowserWindow({
@ -39,7 +39,8 @@ class WebView {
this.digitalWindow = null; this.digitalWindow = null;
this.close(); this.close();
}); });
this.digitalWindow.hide(); //this.digitalWindow.hide();
this.platform = platform;
} }
async open() { async open() {
this.digitalWindow.show(); this.digitalWindow.show();
@ -47,6 +48,9 @@ class WebView {
this.opened = true; this.opened = true;
await this.digitalWindow.setFullScreen(true); await this.digitalWindow.setFullScreen(true);
await delay_1.delay(300); await delay_1.delay(300);
if (this.platform === 'osx') {
await delay_1.delay(300); //give macs an extra 300ms to open fullscreen
}
} }
async show(src) { async show(src) {
if (!this.digitalWindow) { if (!this.digitalWindow) {
@ -150,7 +154,7 @@ class Display {
async open() { async open() {
//if (this.platform !== 'nix') { //if (this.platform !== 'nix') {
if (!this.wv || !this.wv.opened) { if (!this.wv || !this.wv.opened) {
this.wv = new WebView(); this.wv = new WebView(this.platform);
await this.wv.open(); await this.wv.open();
} }
//} else { //} else {

2
lib/display/index.js.map
View File

File diff suppressed because one or more lines are too long

12
src/display/index.ts
View File

@ -25,7 +25,9 @@ class WebView {
private digitalWindow : any; private digitalWindow : any;
public opened : boolean = false; public opened : boolean = false;
public showing : boolean = false; public showing : boolean = false;
constructor() { private platform : string;
constructor (platform : string) {
this.digitalWindow = new BrowserWindow({ this.digitalWindow = new BrowserWindow({
webPreferences: { webPreferences: {
nodeIntegration: true, nodeIntegration: true,
@ -45,7 +47,8 @@ class WebView {
this.digitalWindow = null; this.digitalWindow = null;
this.close(); this.close();
}); });
this.digitalWindow.hide(); //this.digitalWindow.hide();
this.platform = platform;
} }
async open () { async open () {
this.digitalWindow.show(); this.digitalWindow.show();
@ -53,6 +56,9 @@ class WebView {
this.opened = true; this.opened = true;
await this.digitalWindow.setFullScreen(true); await this.digitalWindow.setFullScreen(true);
await delay(300); await delay(300);
if (this.platform === 'osx') {
await delay(300); //give macs an extra 300ms to open fullscreen
}
} }
async show (src : string) { async show (src : string) {
if (!this.digitalWindow) { if (!this.digitalWindow) {
@ -164,7 +170,7 @@ class Display {
public async open () { public async open () {
//if (this.platform !== 'nix') { //if (this.platform !== 'nix') {
if (!this.wv || !this.wv.opened) { if (!this.wv || !this.wv.opened) {
this.wv = new WebView(); this.wv = new WebView(this.platform);
await this.wv.open() await this.wv.open()
} }
//} else { //} else {