From f1e7da5354aacc2b4e1b634cf563b33afda7734a Mon Sep 17 00:00:00 2001
From: AkiraFukushima
Date: Thu, 17 Sep 2020 23:44:31 +0900
Subject: [PATCH 1/4] Fix window height of new toot when close window with poll
---
src/renderer/components/TimelineSpace/Modals/NewToot.vue | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/renderer/components/TimelineSpace/Modals/NewToot.vue b/src/renderer/components/TimelineSpace/Modals/NewToot.vue
index 72174fd5..bc4025af 100644
--- a/src/renderer/components/TimelineSpace/Modals/NewToot.vue
+++ b/src/renderer/components/TimelineSpace/Modals/NewToot.vue
@@ -254,12 +254,14 @@ export default {
methods: {
close() {
this.filteredAccount = []
+ const pollHeight = this.$refs.poll ? this.$refs.poll.$el.offsetHeight : 0
this.openPoll = false
this.polls = []
this.pollExpire = {
label: this.$t('modals.new_toot.poll.expires.1_day'),
value: 3600 * 24
}
+ this.statusHeight = this.statusHeight + pollHeight
this.$store.dispatch('TimelineSpace/Modals/NewToot/resetMediaCount')
this.$store.dispatch('TimelineSpace/Modals/NewToot/closeModal')
},
From 2327acd3c5b389af56ba73a28cd8f0a7dcebc577 Mon Sep 17 00:00:00 2001
From: AkiraFukushima
Date: Thu, 17 Sep 2020 23:53:42 +0900
Subject: [PATCH 2/4] Fix window height of new toot when close window with
spoiler
---
src/renderer/components/TimelineSpace/Modals/NewToot.vue | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/renderer/components/TimelineSpace/Modals/NewToot.vue b/src/renderer/components/TimelineSpace/Modals/NewToot.vue
index bc4025af..7188497e 100644
--- a/src/renderer/components/TimelineSpace/Modals/NewToot.vue
+++ b/src/renderer/components/TimelineSpace/Modals/NewToot.vue
@@ -254,6 +254,10 @@ export default {
methods: {
close() {
this.filteredAccount = []
+ const spoilerHeight = this.$refs.spoiler ? this.$refs.spoiler.offsetHeight : 0
+ this.showContentWarning = false
+ this.spoiler = ''
+ this.statusHeight = this.statusHeight + spoilerHeight
const pollHeight = this.$refs.poll ? this.$refs.poll.$el.offsetHeight : 0
this.openPoll = false
this.polls = []
From e17931239318b38073743359c6c060b737fe6413 Mon Sep 17 00:00:00 2001
From: AkiraFukushima
Date: Thu, 17 Sep 2020 23:59:18 +0900
Subject: [PATCH 3/4] Fix window height of new toot when close window with
metidas
---
src/renderer/components/TimelineSpace/Modals/NewToot.vue | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/renderer/components/TimelineSpace/Modals/NewToot.vue b/src/renderer/components/TimelineSpace/Modals/NewToot.vue
index 7188497e..c3abfbbb 100644
--- a/src/renderer/components/TimelineSpace/Modals/NewToot.vue
+++ b/src/renderer/components/TimelineSpace/Modals/NewToot.vue
@@ -266,6 +266,8 @@ export default {
value: 3600 * 24
}
this.statusHeight = this.statusHeight + pollHeight
+ const attachmentHeight = this.$refs.preview ? this.$refs.preview.offsetHeight : 0
+ this.statusHeight = this.statusHeight + attachmentHeight
this.$store.dispatch('TimelineSpace/Modals/NewToot/resetMediaCount')
this.$store.dispatch('TimelineSpace/Modals/NewToot/closeModal')
},
From 025b8c45c1eacb17dd7e0029999ecffc0f5fdb9a Mon Sep 17 00:00:00 2001
From: AkiraFukushima
Date: Fri, 18 Sep 2020 00:03:11 +0900
Subject: [PATCH 4/4] Fix window height of new toot when close window with
quoted status
---
src/renderer/components/TimelineSpace/Modals/NewToot.vue | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/renderer/components/TimelineSpace/Modals/NewToot.vue b/src/renderer/components/TimelineSpace/Modals/NewToot.vue
index c3abfbbb..cfff2fb3 100644
--- a/src/renderer/components/TimelineSpace/Modals/NewToot.vue
+++ b/src/renderer/components/TimelineSpace/Modals/NewToot.vue
@@ -266,6 +266,8 @@ export default {
value: 3600 * 24
}
this.statusHeight = this.statusHeight + pollHeight
+ const quoteHeight = this.$refs.quote ? this.$refs.quote.$el.offsetHeight : 0
+ this.statusHeight = this.statusHeight + quoteHeight
const attachmentHeight = this.$refs.preview ? this.$refs.preview.offsetHeight : 0
this.statusHeight = this.statusHeight + attachmentHeight
this.$store.dispatch('TimelineSpace/Modals/NewToot/resetMediaCount')