Skip to content

Commit d951419

Browse files
committed
更新[BoxJs TF]: 修复顶栏隐藏时图标没往上挪, 悬浮按钮上滑切壁纸, 壁纸模式隐藏悬浮按钮
1 parent 5dc06c3 commit d951419

3 files changed

Lines changed: 43 additions & 8 deletions

File tree

‎box/chavy.boxjs.html‎

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
<div id="BG"></div>
8787
<div id="app" v-cloak>
8888
<v-app v-if="box" :style="appViewStyle">
89-
<v-app-bar app v-bind="appBarBind" v-show="!box.usercfgs.isHidedSearchBar">
89+
<v-app-bar app v-bind="appBarBind" v-if="!box.usercfgs.isHidedSearchBar">
9090
<!-- 搜索条 -->
9191
<v-autocomplete v-bind="ui.searchBar" :label="title" @click="ui.searchDialog.show = true" hide-no-data hide-details solo>
9292
<template #prepend-inner>
@@ -1075,7 +1075,7 @@ <h2>{{curbak.name}}</h2>
10751075
</v-bottom-navigation>
10761076
<v-fab-transition>
10771077
<v-speed-dial
1078-
v-show="!box.usercfgs.isHideBoxIcon"
1078+
v-show="!box.usercfgs.isHideBoxIcon && !isWallpaperMode"
10791079
direction="top"
10801080
fixed
10811081
fab
@@ -1091,7 +1091,10 @@ <h2>{{curbak.name}}</h2>
10911091
v-touch="{
10921092
left: () => box.usercfgs.isLeftBoxIcon = true,
10931093
right: () => box.usercfgs.isLeftBoxIcon = false,
1094-
up: () => reload(),
1094+
up: () => {
1095+
clearWallpaper()
1096+
setWallpaper()
1097+
},
10951098
down: () => isWallpaperMode = !!!isWallpaperMode
10961099
}"
10971100
>
@@ -1732,14 +1735,20 @@ <h2 :class="version === ver.version ? 'primary--text' : undefined">v{{ver.versio
17321735
onScroll(event) {
17331736
const currentY = event.currentTarget.scrollY
17341737
const historyY = this.ui.scrollY[this.path]
1735-
console.log(`historyY: ${historyY}, currentY: ${currentY}`)
17361738
this.ui.scrollY[this.path] = event.currentTarget.scrollY
17371739
// 下拉显示/隐藏顶栏
17381740
// 回弹时才触发显示与隐藏, 1 秒内不重复触发
17391741
if (currentY < historyY && currentY < -80 && !this.ui.isWaitToggleSearchBar) {
1740-
this.ui.isWaitToggleSearchBar = true
1741-
this.box.usercfgs.isHidedSearchBar = !this.box.usercfgs.isHidedSearchBar
1742-
this.toggleWaitSearchBar()
1742+
// 壁纸模式: 取消模式模式
1743+
if (this.isWallpaperMode) {
1744+
this.isWallpaperMode = false
1745+
}
1746+
// 非壁纸模式: 显示&隐藏顶栏
1747+
else {
1748+
this.ui.isWaitToggleSearchBar = true
1749+
this.box.usercfgs.isHidedSearchBar = !this.box.usercfgs.isHidedSearchBar
1750+
this.toggleWaitSearchBar()
1751+
}
17431752
}
17441753
},
17451754
setWallpaper() {

‎box/chavy.boxjs.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
const $ = new Env('BoxJs')
22

3-
$.version = '0.7.40'
3+
$.version = '0.7.41'
44
$.versionType = 'beta'
55

66
/**

‎box/release/box.release.tf.json‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,31 @@
11
{
22
"releases": [
3+
{
4+
"version": "0.7.41",
5+
"tags": ["beta"],
6+
"author": "@chavyleung",
7+
"icon": "https://avatars3.githubusercontent.com/u/29748519",
8+
"repo": "https://github.com/chavyleung",
9+
"msg": "更新[BoxJs TF]: 修复顶栏隐藏时图标没往上挪, 悬浮按钮上滑切壁纸, 壁纸模式隐藏悬浮按钮",
10+
"notes": [
11+
{
12+
"name": "优化",
13+
"descs": ["壁纸模式会把悬浮按钮也隐藏起来"]
14+
},
15+
{
16+
"name": "修复",
17+
"descs": ["顶栏隐藏时图标没有往上挪"]
18+
},
19+
{
20+
"name": "悬浮按钮手势",
21+
"descs": ["上滑: 重渲染&切换壁纸", "左滑: 悬浮按钮左靠", "右滑: 悬浮按钮右靠", "下滑: 切换壁纸模式"]
22+
},
23+
{
24+
"name": "说明",
25+
"descs": ["壁纸模式下: 下滑取消壁纸模式", "非壁纸模式: 下滑显示\\隐藏顶栏"]
26+
}
27+
]
28+
},
329
{
430
"version": "0.7.40",
531
"tags": ["beta"],

0 commit comments

Comments
 (0)