graphite/Sharkey
1
0
Fork 0
mirror of https://git.joinsharkey.org/Sharkey/Sharkey.git synced 2024-11-27 19:23:08 +02:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
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: {
get() { return this.$store.state.settings.lineWidth; },
set(value) { this.$store.dispatch('settings/set', { key: 'lineWidth', value }); }
get() { return this.$store.state.device.lineWidth; },
set(value) { this.$store.commit('device/set', { key: 'lineWidth', value }); }
},
fetchOnScroll: {

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

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

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

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

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

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