diff --git a/src/renderer/components/TimelineSpace/Contents/DirectMessages.vue b/src/renderer/components/TimelineSpace/Contents/DirectMessages.vue index bb2f246f..6dad5abf 100644 --- a/src/renderer/components/TimelineSpace/Contents/DirectMessages.vue +++ b/src/renderer/components/TimelineSpace/Contents/DirectMessages.vue @@ -15,6 +15,7 @@ @focusPrev="focusPrev" @focusRight="focusSidebar" @selectToot="focusToot(item)" + @sizeChanged="sizeChanged" > @@ -254,6 +255,12 @@ export default { this.focusedId = this.timeline[0].uri + this.timeline[0].id break } + }, + sizeChanged() { + this.$store.commit('TimelineSpace/Contents/DirectMessages/changeScrolling', true) + setTimeout(() => { + this.$store.commit('TimelineSpace/Contents/DirectMessages/changeScrolling', false) + }, 500) } } } diff --git a/src/renderer/components/TimelineSpace/Contents/Hashtag/Tag.vue b/src/renderer/components/TimelineSpace/Contents/Hashtag/Tag.vue index 8a1d2daa..9c783828 100644 --- a/src/renderer/components/TimelineSpace/Contents/Hashtag/Tag.vue +++ b/src/renderer/components/TimelineSpace/Contents/Hashtag/Tag.vue @@ -15,6 +15,7 @@ @focusPrev="focusPrev" @focusRight="focusSidebar" @selectToot="focusToot(item)" + @sizeChanged="sizeChanged" > @@ -270,6 +271,12 @@ export default { this.focusedId = this.timeline[0].uri + this.timeline[0].id break } + }, + sizeChanged() { + this.$store.commit('TimelineSpace/Contents/Hashtag/Tag/changeScrolling', true) + setTimeout(() => { + this.$store.commit('TimelineSpace/Contents/Hashtag/Tag/changeScrolling', false) + }, 500) } } } diff --git a/src/renderer/components/TimelineSpace/Contents/Home.vue b/src/renderer/components/TimelineSpace/Contents/Home.vue index e80e35bc..3ccac1e0 100644 --- a/src/renderer/components/TimelineSpace/Contents/Home.vue +++ b/src/renderer/components/TimelineSpace/Contents/Home.vue @@ -15,6 +15,7 @@ @focusPrev="focusPrev" @focusRight="focusSidebar" @selectToot="focusToot(item)" + @sizeChanged="sizeChanged" > @@ -253,6 +254,12 @@ export default { this.focusedId = this.timeline[0].uri + this.timeline[0].id break } + }, + sizeChanged() { + this.$store.commit('TimelineSpace/Contents/Home/changeScrolling', true) + setTimeout(() => { + this.$store.commit('TimelineSpace/Contents/Home/changeScrolling', false) + }, 500) } } } diff --git a/src/renderer/components/TimelineSpace/Contents/Lists/Show.vue b/src/renderer/components/TimelineSpace/Contents/Lists/Show.vue index a2dbd95b..0f5327f9 100644 --- a/src/renderer/components/TimelineSpace/Contents/Lists/Show.vue +++ b/src/renderer/components/TimelineSpace/Contents/Lists/Show.vue @@ -15,6 +15,7 @@ @focusPrev="focusPrev" @focusRight="focusSidebar" @selectToot="focusToot(item)" + @sizeChanged="sizeChanged" > @@ -270,6 +271,12 @@ export default { this.focusedId = this.timeline[0].uri + this.timeline[0].id break } + }, + sizeChanged() { + this.$store.commit('TimelineSpace/Contents/Lists/Show/changeScrolling', true) + setTimeout(() => { + this.$store.commit('TimelineSpace/Contents/Lists/Show/changeScrolling', false) + }, 500) } } } diff --git a/src/renderer/components/TimelineSpace/Contents/Local.vue b/src/renderer/components/TimelineSpace/Contents/Local.vue index 8e962233..0cf97798 100644 --- a/src/renderer/components/TimelineSpace/Contents/Local.vue +++ b/src/renderer/components/TimelineSpace/Contents/Local.vue @@ -15,6 +15,7 @@ @focusPrev="focusPrev" @focusRight="focusSidebar" @selectToot="focusToot(item)" + @sizeChanged="sizeChanged" > @@ -252,6 +253,12 @@ export default { this.focusedId = this.timeline[0].uri + this.timeline[0].id break } + }, + sizeChanged() { + this.$store.commit('TimelineSpace/Contents/Local/changeScrolling', true) + setTimeout(() => { + this.$store.commit('TimelineSpace/Contents/Local/changeScrolling', false) + }, 500) } } } diff --git a/src/renderer/components/TimelineSpace/Contents/Mentions.vue b/src/renderer/components/TimelineSpace/Contents/Mentions.vue index 819dcacc..a73b14ce 100644 --- a/src/renderer/components/TimelineSpace/Contents/Mentions.vue +++ b/src/renderer/components/TimelineSpace/Contents/Mentions.vue @@ -14,6 +14,7 @@ @focusPrev="focusPrev" @focusRight="focusSidebar" @selectNotification="focusNotification(item)" + @sizeChanged="sizeChanged" > @@ -229,6 +230,12 @@ export default { this.focusedId = this.mentions[0].id break } + }, + sizeChanged() { + this.$store.commit('TimelineSpace/Contents/Mentions/changeScrolling', true) + setTimeout(() => { + this.$store.commit('TimelineSpace/Contents/Mentions/changeScrolling', false) + }, 500) } } } diff --git a/src/renderer/components/TimelineSpace/Contents/Public.vue b/src/renderer/components/TimelineSpace/Contents/Public.vue index 3301a4bf..140f6aed 100644 --- a/src/renderer/components/TimelineSpace/Contents/Public.vue +++ b/src/renderer/components/TimelineSpace/Contents/Public.vue @@ -15,6 +15,7 @@ @focusPrev="focusPrev" @focusRight="focusSidebar" @selectToot="focusToot(item)" + @sizeChanged="sizeChanged" > @@ -255,6 +256,12 @@ export default { this.focusedId = this.timeline[0].uri + this.timeline[0].id break } + }, + sizeChanged() { + this.$store.commit('TimelineSpace/Contents/Public/changeScrolling', true) + setTimeout(() => { + this.$store.commit('TimelineSpace/Contents/Public/changeScrolling', false) + }, 500) } } } diff --git a/src/renderer/components/organisms/Toot.vue b/src/renderer/components/organisms/Toot.vue index 3ece084d..a66f0441 100644 --- a/src/renderer/components/organisms/Toot.vue +++ b/src/renderer/components/organisms/Toot.vue @@ -64,10 +64,10 @@
- + {{ $t('cards.toot.show_more') }} - + {{ $t('cards.toot.hide') }}
@@ -80,7 +80,7 @@
- + {{ $t('cards.toot.sensitive') }}
@@ -88,7 +88,7 @@ v-show="sensitive && isShowAttachments" class="hide-sensitive" type="text" - @click="showAttachments = false" + @click="toggleCW()" :title="$t('cards.toot.hide')" > @@ -684,8 +684,8 @@ export default { break } case 'cw': - this.showContent = !this.showContent - this.showAttachments = !this.showAttachments + this.toggleSpoiler() + this.toggleCW() break } }, @@ -742,6 +742,14 @@ export default { }, hideMenu() { this.openToolMenu = false + }, + toggleSpoiler() { + this.showContent = !this.showContent + this.$emit('sizeChanged', true) + }, + toggleCW() { + this.showAttachments = !this.showAttachments + this.$emit('sizeChanged', true) } } }