From 43b3f37e277f97550d7182df75fa01d30648307e Mon Sep 17 00:00:00 2001 From: Takusea Date: Sat, 7 Sep 2024 17:58:34 +0900 Subject: [PATCH 1/5] =?UTF-8?q?HelpDialog=E3=81=AE=E3=83=AC=E3=82=A4?= =?UTF-8?q?=E3=82=A2=E3=82=A6=E3=83=88=E3=82=92BaseNavigationView=E3=82=92?= =?UTF-8?q?=E4=BD=BF=E3=81=A3=E3=81=9F=E3=82=82=E3=81=AE=E3=81=AB=E5=A4=89?= =?UTF-8?q?=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Dialog/HelpDialog/HelpDialog.vue | 154 ++++++++---------- 1 file changed, 69 insertions(+), 85 deletions(-) diff --git a/src/components/Dialog/HelpDialog/HelpDialog.vue b/src/components/Dialog/HelpDialog/HelpDialog.vue index a1224813c8..eb718f71ef 100644 --- a/src/components/Dialog/HelpDialog/HelpDialog.vue +++ b/src/components/Dialog/HelpDialog/HelpDialog.vue @@ -7,70 +7,66 @@ class="help-dialog transparent-backdrop" > -
-
- -
- -
- -
- - - - - + + + + ヘルプ / + {{ selectedPage.parent ? selectedPage.parent + " / " : "" + }}{{ selectedPage.name }} + + + ログフォルダを開く + + + + + + + + + + + + + + @@ -83,7 +79,7 @@ import OssLicense from "./HelpOssLicenseSection.vue"; import UpdateInfo from "./HelpUpdateInfoSection.vue"; import LibraryPolicy from "./HelpLibraryPolicySection.vue"; import BaseListItem from "@/components/Base/BaseListItem.vue"; -import BaseScrollArea from "@/components/Base/BaseScrollArea.vue"; +import BaseNavigationView from "@/components/Base/BaseNavigationView.vue"; import { UpdateInfo as UpdateInfoObject, UrlString } from "@/type/preload"; import { useStore } from "@/store"; import { useFetchNewUpdateInfos } from "@/composables/useFetchNewUpdateInfos"; @@ -284,6 +280,14 @@ const pagedata = computed(() => { const selectedPageIndex = ref(0); +const selectedPage = computed(() => { + if (pagedata.value[selectedPageIndex.value].type == "item") { + return pagedata.value[selectedPageIndex.value] as PageItem; + } else { + return undefined; + } +}); + const openLogDirectory = () => window.backend.openLogDirectory(); @@ -291,26 +295,6 @@ const openLogDirectory = () => window.backend.openLogDirectory(); @use "@/styles/v2/colors" as colors; @use "@/styles/v2/variables" as vars; -.grid { - display: grid; - grid-template-columns: auto 1fr; - backdrop-filter: blur(32px); - background-color: colors.$background-drawer; -} - -// TODO: MenuBar+Header分のマージン。Dialogコンポーネント置き換え後削除 -.list-wrapper { - margin-top: 66px; - height: calc(100vh - 90px); - width: max-content; -} - -.list-inner { - display: flex; - flex-direction: column; - padding: vars.$padding-2; -} - .list-label { padding: vars.$padding-2; padding-bottom: vars.$padding-1; @@ -328,6 +312,6 @@ const openLogDirectory = () => window.backend.openLogDirectory(); } .q-tab-panels { - background: none; + display: contents; } From 48dcbdd62c7b8afc9826010bc05deeb32c79de2f Mon Sep 17 00:00:00 2001 From: Takusea Date: Sat, 7 Sep 2024 17:59:14 +0900 Subject: [PATCH 2/5] =?UTF-8?q?=E4=B8=8D=E8=A6=81=E3=81=AA=E8=A8=98?= =?UTF-8?q?=E8=BF=B0=E3=82=92=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Dialog/HelpDialog/HelpLibraryPolicySection.vue | 6 +----- .../Dialog/HelpDialog/HelpMarkdownViewSection.vue | 6 +----- src/components/Dialog/HelpDialog/HelpOssLicenseSection.vue | 6 +----- src/components/Dialog/HelpDialog/HelpUpdateInfoSection.vue | 6 +----- 4 files changed, 4 insertions(+), 20 deletions(-) diff --git a/src/components/Dialog/HelpDialog/HelpLibraryPolicySection.vue b/src/components/Dialog/HelpDialog/HelpLibraryPolicySection.vue index 4007eaa0dc..2a90729a47 100644 --- a/src/components/Dialog/HelpDialog/HelpLibraryPolicySection.vue +++ b/src/components/Dialog/HelpDialog/HelpLibraryPolicySection.vue @@ -131,11 +131,7 @@ const selectCharacterInfo = (index: DetailKey | undefined) => { @use "@/styles/v2/colors" as colors; .container { - // TODO: 親コンポーネントからheightを取得できないため一時的にcalcを使用、HelpDialogの構造を再設計後100%に変更する - // height: 100%; - height: calc(100vh - 90px); - background-color: colors.$background; - border-left: 1px solid colors.$border; + height: 100%; } .inner { diff --git a/src/components/Dialog/HelpDialog/HelpMarkdownViewSection.vue b/src/components/Dialog/HelpDialog/HelpMarkdownViewSection.vue index 44648f80c6..812a8d7d6e 100644 --- a/src/components/Dialog/HelpDialog/HelpMarkdownViewSection.vue +++ b/src/components/Dialog/HelpDialog/HelpMarkdownViewSection.vue @@ -35,11 +35,7 @@ onMounted(async () => { @use "@/styles/v2/colors" as colors; .container { - // TODO: 親コンポーネントからheightを取得できないため一時的にcalcを使用、HelpDialogの構造を再設計後100%に変更する - // height: 100%; - height: calc(100vh - 90px); - background-color: colors.$background; - border-left: 1px solid colors.$border; + height: 100%; } .inner { diff --git a/src/components/Dialog/HelpDialog/HelpOssLicenseSection.vue b/src/components/Dialog/HelpDialog/HelpOssLicenseSection.vue index cd575c5980..5b40d44e95 100644 --- a/src/components/Dialog/HelpDialog/HelpOssLicenseSection.vue +++ b/src/components/Dialog/HelpDialog/HelpOssLicenseSection.vue @@ -60,11 +60,7 @@ const selectLicenseIndex = (index: number | undefined) => { @use "@/styles/v2/colors" as colors; .container { - // TODO: 親コンポーネントからheightを取得できないため一時的にcalcを使用、HelpDialogの構造を再設計後100%に変更する - // height: 100%; - height: calc(100vh - 90px); - background-color: colors.$background; - border-left: 1px solid colors.$border; + height: 100%; } .inner { diff --git a/src/components/Dialog/HelpDialog/HelpUpdateInfoSection.vue b/src/components/Dialog/HelpDialog/HelpUpdateInfoSection.vue index d7639fac87..bf238a836a 100644 --- a/src/components/Dialog/HelpDialog/HelpUpdateInfoSection.vue +++ b/src/components/Dialog/HelpDialog/HelpUpdateInfoSection.vue @@ -61,11 +61,7 @@ const props = defineProps<{ @use "@/styles/v2/colors" as colors; .container { - // TODO: 親コンポーネントからheightを取得できないため一時的にcalcを使用、HelpDialogの構造を再設計後100%に変更する - // height: 100%; - height: calc(100vh - 90px); - background-color: colors.$background; - border-left: 1px solid colors.$border; + height: 100%; } .inner { From 426a1f78a681c5a99368549bc7f3e21abdff97ee Mon Sep 17 00:00:00 2001 From: Takusea Date: Sat, 7 Sep 2024 18:00:35 +0900 Subject: [PATCH 3/5] =?UTF-8?q?=E3=82=B3=E3=83=B3=E3=83=9D=E3=83=BC?= =?UTF-8?q?=E3=83=8D=E3=83=B3=E3=83=88=E5=86=85=E3=81=AE=E6=96=87=E5=AD=97?= =?UTF-8?q?=E8=89=B2=E3=82=92=E7=B5=B1=E4=B8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Base/BaseNavigationView.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/Base/BaseNavigationView.vue b/src/components/Base/BaseNavigationView.vue index c92dc53b4b..74cc2c0919 100644 --- a/src/components/Base/BaseNavigationView.vue +++ b/src/components/Base/BaseNavigationView.vue @@ -30,6 +30,7 @@ import BaseScrollArea from "./BaseScrollArea.vue"; grid-template-rows: 100%; backdrop-filter: blur(32px); background-color: colors.$background-drawer; + color: colors.$display; } .sidebar-inner { From 5588961ed7834561e7b75149cc522353856b314a Mon Sep 17 00:00:00 2001 From: Takusea Date: Sat, 7 Sep 2024 21:43:46 +0900 Subject: [PATCH 4/5] =?UTF-8?q?subtitle=E3=82=AF=E3=83=A9=E3=82=B9?= =?UTF-8?q?=E3=81=AB=E4=B8=8A=E9=83=A8margin=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Dialog/HelpDialog/HelpLibraryPolicySection.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/Dialog/HelpDialog/HelpLibraryPolicySection.vue b/src/components/Dialog/HelpDialog/HelpLibraryPolicySection.vue index 2a90729a47..87675f6f9f 100644 --- a/src/components/Dialog/HelpDialog/HelpLibraryPolicySection.vue +++ b/src/components/Dialog/HelpDialog/HelpLibraryPolicySection.vue @@ -149,6 +149,7 @@ const selectCharacterInfo = (index: DetailKey | undefined) => { .subtitle { @include mixin.headline-2; + margin-top: vars.$gap-2; } .list { From 908c190502b870e76dd79c4430f68f67bdffc76e Mon Sep 17 00:00:00 2001 From: Takusea Date: Thu, 12 Sep 2024 22:03:41 +0900 Subject: [PATCH 5/5] =?UTF-8?q?selectedPage=E3=81=AEcomputed=E9=96=A2?= =?UTF-8?q?=E6=95=B0=E3=82=92=E3=82=A8=E3=83=A9=E3=83=BC=E3=82=92=E8=BF=94?= =?UTF-8?q?=E3=81=99=E5=BD=A2=E3=81=AB=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Dialog/HelpDialog/HelpDialog.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/Dialog/HelpDialog/HelpDialog.vue b/src/components/Dialog/HelpDialog/HelpDialog.vue index eb718f71ef..db7b0851b1 100644 --- a/src/components/Dialog/HelpDialog/HelpDialog.vue +++ b/src/components/Dialog/HelpDialog/HelpDialog.vue @@ -9,7 +9,7 @@ - + ヘルプ / {{ selectedPage.parent ? selectedPage.parent + " / " : "" @@ -284,7 +284,7 @@ const selectedPage = computed(() => { if (pagedata.value[selectedPageIndex.value].type == "item") { return pagedata.value[selectedPageIndex.value] as PageItem; } else { - return undefined; + throw new Error("selectedPageにはPageItem型の値を指定してください。"); } });