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.

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

Billy/764 flash white start #875

Merged
merged 3 commits into from
Jun 25, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
* Fixed bug in yarn build:gaia @zramsay
* Increased version of localtestnet used for testing to match gaia @faboweb
* Fixed padding issue in main container @faboweb
* Fixed white flash on startup @okwme
* Fixed critical dependency warning @okwme

### Added

Expand Down
6 changes: 6 additions & 0 deletions app/src/main/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@ function shutdown() {

function createWindow() {
mainWindow = new BrowserWindow({
show: false,
minWidth: 320,
minHeight: 480,
width: 1024,
Expand All @@ -137,6 +138,11 @@ function createWindow() {
backgroundColor: "#15182d",
webPreferences: { webSecurity: false }
})
mainWindow.once("ready-to-show", () => {
setTimeout(() => {
mainWindow.show()
}, 300)
})

// start vue app
mainWindow.loadURL(winURL + "?lcd_port=" + LCD_PORT)
Expand Down
2 changes: 0 additions & 2 deletions app/src/renderer/main.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import Vue from "vue"
import Electron from "vue-electron"
import Resource from "vue-resource"
import Router from "vue-router"
import Tooltip from "vue-directive-tooltip"
import Vuelidate from "vuelidate"
Expand Down Expand Up @@ -35,7 +34,6 @@ Vue.config.errorHandler = (error, vm, info) => {
}

Vue.use(Electron)
Vue.use(Resource)
Vue.use(Router)
Vue.use(Tooltip, { delay: 1 })
Vue.use(Vuelidate)
Expand Down
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,6 @@
"vue": "2.5.16",
"vue-directive-tooltip": "1.4.5",
"vue-electron": "1.0.6",
"vue-resource": "1.5.0",
"vue-router": "3.0.1",
"vuelidate": "0.6.2",
"vuex": "3.0.1"
Expand Down
1 change: 1 addition & 0 deletions test/unit/specs/main.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ jest.mock("electron", () => {
}
loadURL() {}
on() {}
once() {}
maximize() {}
},
Menu: {
Expand Down
Loading