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.

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

マルチトラック:デフォルトで有効にする #2285

Merged
merged 13 commits into from
Oct 8, 2024
Merged
6 changes: 3 additions & 3 deletions src/components/Dialog/ImportSongProjectDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -300,19 +300,19 @@ const handleFileChange = async (event: Event) => {
};

// トラックインポート実行時
const handleImportTrack = async () => {
const handleImportTrack = () => {
// ファイルまたは選択中のトラックが未設定の場合はエラー
if (project.value == null || selectedTrackIndexes.value == null) {
throw new Error("project or selected track is not set");
}
// トラックをインポート
if (project.value.type === "vvproj") {
await store.dispatch("COMMAND_IMPORT_VOICEVOX_PROJECT", {
void store.dispatch("COMMAND_IMPORT_VOICEVOX_PROJECT", {
project: project.value.project,
trackIndexes: selectedTrackIndexes.value,
});
} else {
await store.dispatch("COMMAND_IMPORT_UTAFORMATIX_PROJECT", {
void store.dispatch("COMMAND_IMPORT_UTAFORMATIX_PROJECT", {
project: project.value.project,
trackIndexes: selectedTrackIndexes.value,
});
Expand Down
9 changes: 6 additions & 3 deletions src/components/Sing/SingEditor.vue
Original file line number Diff line number Diff line change
Expand Up @@ -73,12 +73,15 @@ const setSidebarWidth = (width: number) => {

// トラック数が1から増えたら、サイドバーを開く
watch(
() => store.state.tracks,
(tracks, oldTracks) => {
if (oldTracks.size === 1 && tracks.size > 1) {
() => store.state.tracks.size,
(tracksSize, oldTracksSize) => {
if (oldTracksSize <= 1 && tracksSize > 1) {
void store.dispatch("SET_SONG_SIDEBAR_OPEN", { isSongSidebarOpen: true });
}
},
{
deep: true,
},
sevenc-nanashi marked this conversation as resolved.
Show resolved Hide resolved
);

const nowRendering = computed(() => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ test.beforeEach(gotoHome);
* 書き出しファイル名パターンダイアログまで移動
*/
const moveToFilenameDialog = async (page: Page, settingDialog: Locator) => {
const fileNamePatternCell = settingDialog.locator("div.q-card__actions", {
has: settingDialog.getByText("書き出しファイル名パターン"),
});
await fileNamePatternCell.getByRole("button", { name: "編集する" }).click();
await settingDialog
.locator("div.q-card__actions", { hasText: "書き出しファイル名パターン" })
.getByRole("button", { name: "編集する" })
.click();
await page.waitForTimeout(500);

const filenameDialog = getNewestQuasarDialog(page);
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading