Skip to content

Commit

Permalink
feat(v1.4.0): 增加全屏模式下的titlebar
Browse files Browse the repository at this point in the history
  • Loading branch information
aitexiaoy committed Feb 18, 2020
1 parent 5b18be5 commit 832ab82
Show file tree
Hide file tree
Showing 12 changed files with 559 additions and 156 deletions.
7 changes: 6 additions & 1 deletion package-lock.json

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

17 changes: 12 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "strawberrywallpaper",
"version": "v1.4",
"version": "v1.4.0",
"author": "taoacat,流浪记",
"description": "a wallpaper app by electron",
"license": "",
Expand Down Expand Up @@ -30,15 +30,21 @@
"provider": "generic",
"url": "http://sw.taoacat.com/version/"
},
"files": ["dist/electron/**/*"],
"files": [
"dist/electron/**/*"
],
"mac": {
"icon": "build-config/icons/icon.icns",
"target":["dmg"]
"target": [
"dmg"
]
},
"win": {
"icon": "build-config/icons/icon.ico",
"requestedExecutionLevel":"highestAvailable",
"target": ["nsis"]
"requestedExecutionLevel": "highestAvailable",
"target": [
"nsis"
]
},
"linux": {
"icon": "build-config/icons"
Expand Down Expand Up @@ -93,6 +99,7 @@
"auto-launch": "^5.0.5",
"axios": "^0.18.0",
"cheerio": "^1.0.0-rc.2",
"custom-electron-titlebar": "^3.2.2-hotfix62",
"electron-log": "^3.0.1",
"electron-updater": "^4.0.6",
"element-ui": "^2.5.4",
Expand Down
10 changes: 10 additions & 0 deletions src/main/full-window.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,22 @@ function createWindow() {
fullWindow = new BrowserWindow({
width: 1200,
height: 700,
frame: false,
maximizable: true,
minimizable: true,
// fullscreenable: true,
// fullscreen: true,
})
fullWindow.loadURL(`${baseUrl}#/full`)

fullWindow.on('close', () => {
fullWindow = null
})

fullWindow.on('enter-full-screen', () => {
// console.log('Jin人员')
// fullWindow.setWindowButtonVisibility(true)
})
}

function openWindow(){
Expand Down
2 changes: 1 addition & 1 deletion src/renderer/components/chrome-icon/index.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<div :class="['chrome-icon',{nodisabled:!disabled}]" @click="handleClick">
<div :class="['chrome-icon',{nodisabled:!disabled}]" @click="handleClick" style="-webkit-app-region: no-drag">
<i :class="['iconfont',icon]" ></i>
</div>
</template>
Expand Down
Loading

0 comments on commit 832ab82

Please sign in to comment.