From fb8ee8f829f1bea81319222414accfdbf312ddfe Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sun, 25 Feb 2018 22:50:26 +0900
Subject: [PATCH] :v:

---
 src/web/app/common/define-widget.ts           |  4 +++
 .../app/common/views/widgets/slideshow.vue    | 28 +++++++++----------
 src/web/app/desktop/views/components/home.vue |  2 +-
 src/web/app/mobile/views/pages/home.vue       |  3 +-
 4 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/src/web/app/common/define-widget.ts b/src/web/app/common/define-widget.ts
index 97925cf44..efce7e813 100644
--- a/src/web/app/common/define-widget.ts
+++ b/src/web/app/common/define-widget.ts
@@ -12,6 +12,10 @@ export default function<T extends object>(data: {
 			isMobile: {
 				type: Boolean,
 				default: false
+			},
+			isCustomizeMode: {
+				type: Boolean,
+				default: false
 			}
 		},
 		computed: {
diff --git a/src/web/app/common/views/widgets/slideshow.vue b/src/web/app/common/views/widgets/slideshow.vue
index 56eb654c2..eb83c6570 100644
--- a/src/web/app/common/views/widgets/slideshow.vue
+++ b/src/web/app/common/views/widgets/slideshow.vue
@@ -1,12 +1,14 @@
 <template>
 <div class="mkw-slideshow">
 	<div @click="choose">
-		<p v-if="props.folder === undefined">クリックしてフォルダを指定してください</p>
+		<p v-if="props.folder === undefined">
+			<template v-if="isCustomizeMode">フォルダを指定するには、カスタマイズモードを終了してください</template>
+			<template v-else>クリックしてフォルダを指定してください</template>
+		</p>
 		<p v-if="props.folder !== undefined && images.length == 0 && !fetching">このフォルダには画像がありません</p>
 		<div ref="slideA" class="slide a"></div>
 		<div ref="slideB" class="slide b"></div>
 	</div>
-	<button @click="resize">%fa:expand%</button>
 </div>
 </template>
 
@@ -42,6 +44,9 @@ export default define({
 		clearInterval(this.clock);
 	},
 	methods: {
+		func() {
+			this.resize();
+		},
 		applySize() {
 			let h;
 
@@ -117,24 +122,17 @@ export default define({
 	border solid 1px rgba(0, 0, 0, 0.075)
 	border-radius 6px
 
-	&:hover > button
-		display block
-
-	> button
-		position absolute
-		left 0
-		bottom 0
-		display none
-		padding 4px
-		font-size 24px
-		color #fff
-		text-shadow 0 0 8px #000
-
 	> div
 		width 100%
 		height 100%
 		cursor pointer
 
+		> p
+			display block
+			margin 1em
+			text-align center
+			color #888
+
 		> *
 			pointer-events none
 
diff --git a/src/web/app/desktop/views/components/home.vue b/src/web/app/desktop/views/components/home.vue
index 59fd2aa36..69f06fbf3 100644
--- a/src/web/app/desktop/views/components/home.vue
+++ b/src/web/app/desktop/views/components/home.vue
@@ -47,7 +47,7 @@
 				:key="place"
 			>
 				<div v-for="widget in widgets[place]" class="customize-container" :key="widget.id" @contextmenu.stop.prevent="onWidgetContextmenu(widget.id)">
-					<component :is="`mkw-${widget.name}`" :widget="widget" :ref="widget.id"/>
+					<component :is="`mkw-${widget.name}`" :widget="widget" :ref="widget.id" :is-customize-mode="true"/>
 				</div>
 			</x-draggable>
 			<div class="main">
diff --git a/src/web/app/mobile/views/pages/home.vue b/src/web/app/mobile/views/pages/home.vue
index f4f458068..2aa650ec5 100644
--- a/src/web/app/mobile/views/pages/home.vue
+++ b/src/web/app/mobile/views/pages/home.vue
@@ -25,6 +25,7 @@
 						<option value="activity">アクティビティ</option>
 						<option value="rss">RSSリーダー</option>
 						<option value="photo-stream">フォトストリーム</option>
+						<option value="slideshow">スライドショー</option>
 						<option value="version">バージョン</option>
 						<option value="access-log">アクセスログ</option>
 						<option value="server">サーバー情報</option>
@@ -45,7 +46,7 @@
 							<span class="handle">%fa:bars%</span>{{ widget.name }}<button class="remove" @click="removeWidget(widget)">%fa:times%</button>
 						</header>
 						<div @click="widgetFunc(widget.id)">
-							<component :is="`mkw-${widget.name}`" :widget="widget" :ref="widget.id" :is-mobile="true"/>
+							<component :is="`mkw-${widget.name}`" :widget="widget" :ref="widget.id" :is-customize-mode="true" :is-mobile="true"/>
 						</div>
 					</div>
 				</x-draggable>