Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

選択中のキャラが一番上に表示されるようにした #1176

Merged
merged 9 commits into from
Feb 5, 2023
Merged

選択中のキャラが一番上に表示されるようにした #1176

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f8bd755
選択中のキャラが一番上に表示されるようにした
tunamaguro Feb 4, 2023
cb924fd
ロジックをまとめた
tunamaguro Feb 5, 2023
83da161
区別しやすいクラス名に修正
tunamaguro Feb 5, 2023
6f152e7
computedを使うように変更
tunamaguro Feb 5, 2023
e48b0df
Update src/components/CharacterButton.vue
tunamaguro Feb 5, 2023
684161e
typo
tunamaguro Feb 5, 2023
2b49502
Merge branch 'issue/#897' of https://github.com/tunamaguro/voicevox i…
tunamaguro Feb 5, 2023
96ad905
computed包んでもキャッシュされなさそうなので元に戻す
tunamaguro Feb 5, 2023
3e01463
Update src/components/CharacterButton.vue
tunamaguro Feb 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion src/components/CharacterButton.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
transition-show="none"
transition-hide="none"
>
<q-list style="min-width: max-content">
<q-list style="min-width: max-content" class="item-container">
tunamaguro marked this conversation as resolved.
Show resolved Hide resolved
<q-item
v-if="selectedStyleInfo == undefined && !emptiable"
class="row no-wrap items-center"
Expand Down Expand Up @@ -57,6 +57,12 @@
v-for="(characterInfo, characterIndex) in characterInfos"
:key="characterIndex"
class="q-pa-none"
:class="
selectedCharacter != undefined &&
characterInfo.metas.speakerUuid ===
selectedCharacter.metas.speakerUuid &&
'selected-row'
Hiroshiba marked this conversation as resolved.
Show resolved Hide resolved
"
>
<q-btn-group flat class="col full-width">
<q-btn
Expand Down Expand Up @@ -349,6 +355,11 @@ export default defineComponent({
}

.character-menu {
.item-container {
display: flex;
flex-direction: column;
}

.q-item {
color: colors.$display;
}
Expand All @@ -363,6 +374,10 @@ export default defineComponent({
}
}

.selected-row {
order: -1;
}

.selected-character-item,
.opened-character-item {
background-color: rgba(colors.$primary-rgb, 0.2);
tunamaguro marked this conversation as resolved.
Show resolved Hide resolved
Expand Down