From d815838762425d08e3466f7efca5c3ffcf646e7f Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Tue, 29 Dec 2020 17:40:53 +0900
Subject: カラムのフレキシブル設定を上下分割されていても適用するように
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/client/ui/deck.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/client/ui/deck.vue')

diff --git a/src/client/ui/deck.vue b/src/client/ui/deck.vue
index 9d11a89330..099a6f60c6 100644
--- a/src/client/ui/deck.vue
+++ b/src/client/ui/deck.vue
@@ -8,7 +8,7 @@
 		<!-- sectionを利用しているのは、deck.vue側でcolumnに対してfirst-of-typeを効かせるため -->
 		<section v-if="ids.length > 1"
 			class="folder column"
-			:style="{ width: Math.max(...columns.filter(c => ids.includes(c.id)).map(c => c.width)) + 'px' }"
+			:style="columns.filter(c => ids.includes(c.id)).some(c => c.flexible) ? { flex: 1, minWidth: '350px' } : { width: Math.max(...columns.filter(c => ids.includes(c.id)).map(c => c.width)) + 'px' }"
 		>
 			<DeckColumnCore v-for="id in ids" :ref="id" :key="id" :column="columns.find(c => c.id === id)" :is-stacked="true" @parent-focus="moveFocus(id, $event)"/>
 		</section>
-- 
cgit v1.2.3-freya