github
/
lx-music-desktop
mirror of https://github.com/lyswhut/lx-music-desktop
1
0
Fork 0
Code Issues Releases Wiki Activity

修复禁用快捷键的情况下设置全局快捷键的bug，优化启用/禁用视觉效果

pull/277/head
lyswhut 2020-06-24 16:17:24 +08:00
parent cc5d119ba4
commit 32ffe33e1a
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/renderer/views/Setting.vue
View File

@ -137,7 +137,7 @@ div.scroll(:class="$style.setting")
h3 {{$t('view.setting.hot_key_local_title')}} h3 {{$t('view.setting.hot_key_local_title')}}
div div
material-checkbox(id="setting_download_hotKeyLocal" v-model="current_hot_key.local.enable" :label="$t('view.setting.is_enable')" @change="handleHotKeySaveConfig") material-checkbox(id="setting_download_hotKeyLocal" v-model="current_hot_key.local.enable" :label="$t('view.setting.is_enable')" @change="handleHotKeySaveConfig")
div(:class="$style.hotKeyContainer") div(:class="$style.hotKeyContainer" :style="{ opacity: current_hot_key.local.enable ? 1 : .6 }")
div(:class="$style.hotKeyItem" v-for="item in hotKeys.local") div(:class="$style.hotKeyItem" v-for="item in hotKeys.local")
h4(:class="$style.hotKeyItemTitle") {{$t('view.setting.hot_key_' + item.name)}} h4(:class="$style.hotKeyItemTitle") {{$t('view.setting.hot_key_' + item.name)}}
material-input.key-bind(:class="$style.hotKeyItemInput" readonly @keyup.prevent :placeholder="$t('view.setting.hot_key_unset_input')" material-input.key-bind(:class="$style.hotKeyItemInput" readonly @keyup.prevent :placeholder="$t('view.setting.hot_key_unset_input')"
@ -148,7 +148,7 @@ div.scroll(:class="$style.setting")
h3 {{$t('view.setting.hot_key_global_title')}} h3 {{$t('view.setting.hot_key_global_title')}}
div div
material-checkbox(id="setting_download_hotKeyGlobal" v-model="current_hot_key.global.enable" :label="$t('view.setting.is_enable')" @change="handleEnableHotKey") material-checkbox(id="setting_download_hotKeyGlobal" v-model="current_hot_key.global.enable" :label="$t('view.setting.is_enable')" @change="handleEnableHotKey")
div(:class="$style.hotKeyContainer") div(:class="$style.hotKeyContainer" :style="{ opacity: current_hot_key.global.enable ? 1 : .6 }")
div(:class="$style.hotKeyItem" v-for="item in hotKeys.global") div(:class="$style.hotKeyItem" v-for="item in hotKeys.global")
h4(:class="$style.hotKeyItemTitle") {{$t('view.setting.hot_key_' + item.name)}} h4(:class="$style.hotKeyItemTitle") {{$t('view.setting.hot_key_' + item.name)}}
material-input.key-bind(:class="[$style.hotKeyItemInput, hotKeyConfig.global[item.name] && hotKeyStatus[hotKeyConfig.global[item.name].key] && hotKeyStatus[hotKeyConfig.global[item.name].key].status === false ? $style.hotKeyFailed : null]" material-input.key-bind(:class="[$style.hotKeyItemInput, hotKeyConfig.global[item.name] && hotKeyStatus[hotKeyConfig.global[item.name].key] && hotKeyStatus[hotKeyConfig.global[item.name].key].status === false ? $style.hotKeyFailed : null]"
@ -854,7 +854,7 @@ export default {
let config = this.hotKeyConfig[type][info.name] let config = this.hotKeyConfig[type][info.name]
let originKey let originKey
if (newHotKey) { if (newHotKey) {
if (type == 'global' && newHotKey) { if (type == 'global' && newHotKey && this.current_hot_key.global.enable) {
try { try {
await rendererInvoke(NAMES.hotKey.set_config, { await rendererInvoke(NAMES.hotKey.set_config, {
action: 'register', action: 'register',
@ -890,7 +890,7 @@ export default {
this.initHotKeyConfig() this.initHotKeyConfig()
// console.log(this.current_hot_key.global.keys) // console.log(this.current_hot_key.global.keys)
if (originKey) { if (originKey && this.current_hot_key.global.enable) {
try { try {
await rendererInvoke(NAMES.hotKey.set_config, { await rendererInvoke(NAMES.hotKey.set_config, {
action: 'unregister', action: 'unregister',
@ -1104,6 +1104,7 @@ export default {
flex-flow: row wrap; flex-flow: row wrap;
// margin-top: -15px; // margin-top: -15px;
margin-bottom: 15px; margin-bottom: 15px;
transition: opacity @transition-theme;
} }
.hotKeyItem { .hotKeyItem {
width: 30%; width: 30%;