natty
/
calckey
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Client] line thiknessの設定はデバイスに保存するように

This commit is contained in:
syuilo 2018-12-31 00:59:13 +09:00
parent e68c6175ce
commit 84f1ce866b
No known key found for this signature in database
GPG Key ID: BDC4C49D06AB9D69
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/client/app/desktop/views/components/settings.vue
View File

@ -414,8 +414,8 @@ export default Vue.extend({
}, },
lineWidth: { lineWidth: {
get() { return this.$store.state.settings.lineWidth; }, get() { return this.$store.state.device.lineWidth; },
set(value) { this.$store.dispatch('settings/set', { key: 'lineWidth', value }); } set(value) { this.$store.commit('device/set', { key: 'lineWidth', value }); }
}, },
fetchOnScroll: { fetchOnScroll: {

6
src/client/app/init.ts
View File

@ -414,11 +414,11 @@ export default (callback: (launch: (router: VueRouter) => [Vue, MiOS]) => void,
//#endregion //#endregion
//#region line width //#region line width
document.documentElement.style.setProperty('--lineWidth', `${os.store.state.settings.lineWidth}px`); document.documentElement.style.setProperty('--lineWidth', `${os.store.state.device.lineWidth}px`);
os.store.watch(s => { os.store.watch(s => {
return s.settings.lineWidth; return s.device.lineWidth;
}, v => { }, v => {
document.documentElement.style.setProperty('--lineWidth', `${os.store.state.settings.lineWidth}px`); document.documentElement.style.setProperty('--lineWidth', `${os.store.state.device.lineWidth}px`);
}); });
//#endregion //#endregion

4
src/client/app/mobile/views/pages/settings.vue
View File

@ -267,8 +267,8 @@ export default Vue.extend({
}, },
lineWidth: { lineWidth: {
get() { return this.$store.state.settings.lineWidth; }, get() { return this.$store.state.device.lineWidth; },
set(value) { this.$store.dispatch('settings/set', { key: 'lineWidth', value }); } set(value) { this.$store.commit('device/set', { key: 'lineWidth', value }); }
}, },
contrastedAcct: { contrastedAcct: {

2
src/client/app/store.ts
View File

@ -21,7 +21,6 @@ const defaultSettings = {
showClockOnHeader: true, showClockOnHeader: true,
useShadow: true, useShadow: true,
roundedCorners: false, roundedCorners: false,
lineWidth: 1,
circleIcons: true, circleIcons: true,
contrastedAcct: true, contrastedAcct: true,
showFullAcct: false, showFullAcct: false,
@ -53,6 +52,7 @@ const defaultDeviceSettings = {
darkmode: false, darkmode: false,
darkTheme: 'dark', darkTheme: 'dark',
lightTheme: 'light', lightTheme: 'light',
lineWidth: 1,
themes: [], themes: [],
enableSounds: true, enableSounds: true,
soundVolume: 0.5, soundVolume: 0.5,