Skip to content

Commit

Permalink
Merge pull request #306 from hovancik/feature/kiosk
Browse files Browse the repository at this point in the history
Use kiosk instead of fullscreen mode
  • Loading branch information
hovancik authored Oct 16, 2018
2 parents 3505e9a + ef8593b commit 227d68f
Show file tree
Hide file tree
Showing 6 changed files with 4,947 additions and 1,996 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
of system sleep
- Style padding inserted for settings page 3
- better font visibility across platforms
- blocking of all workspaces on macOS

### Changed
- Czech translations updated
Expand Down
4 changes: 2 additions & 2 deletions app/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ function startMicrobreak () {
// microbreakWinLocal.webContents.openDevTools()
microbreakWinLocal.once('ready-to-show', () => {
microbreakWinLocal.show()
microbreakWinLocal.setFullScreen(settings.get('fullscreen'))
microbreakWinLocal.setKiosk(settings.get('fullscreen'))
if (displayIdx === 0) {
breakPlanner.emit('microbreakStarted', true)
}
Expand Down Expand Up @@ -357,7 +357,7 @@ function startBreak () {
// breakWinLocal.webContents.openDevTools()
breakWinLocal.once('ready-to-show', () => {
breakWinLocal.show()
breakWinLocal.setFullScreen(settings.get('fullscreen'))
breakWinLocal.setKiosk(settings.get('fullscreen'))
if (displayIdx === 0) {
breakPlanner.emit('breakStarted', true)
}
Expand Down
84 changes: 39 additions & 45 deletions app/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
"dependencies": {
"@meetfranz/electron-notification-state": "^1.0.0",
"@paulcbetts/system-idle-time": "^1.0.4",
"i18next": "^11.2.3",
"i18next-node-fs-backend": "^1.0.0",
"i18next": "^11.9.1",
"i18next-node-fs-backend": "^2.1.0",
"moment": "^2.22.2"
},
"devDependencies": {}
Expand Down
Loading

0 comments on commit 227d68f

Please sign in to comment.