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

feat: ソング:音素タイミングの表示エリアを追加 #2472

Merged
merged 33 commits into from
Jan 23, 2025
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
f15e54c
パラメーターパネルのエリアを追加、リファクタリング
sigprogramming Jan 4, 2025
7470bd8
キャラクターポートレートのクリッピングコンテナを追加、スタイルを調整
sigprogramming Jan 4, 2025
2e5b636
パラメーターパネルを一旦非表示に
sigprogramming Jan 5, 2025
7a18ff6
storybookを変更
sigprogramming Jan 5, 2025
c219876
GuideLineをsequencerBodyの外に出した
sigprogramming Jan 5, 2025
4bdab0e
パラメーターパネルを表示するかどうかの設定を開発時のみ機能として追加 [update snapshots]
sigprogramming Jan 5, 2025
4f668e3
(スナップショットを更新)
github-actions[bot] Jan 5, 2025
914bcfb
score-sequencerのoverflowを削除
sigprogramming Jan 5, 2025
4756f9b
修正
sigprogramming Jan 5, 2025
4f1c341
unitテストのsnapshotを更新
sigprogramming Jan 5, 2025
6c942e9
ポートレートの表示基準を少し単純にする
romot-co Jan 17, 2025
9f2977f
provide/injectを使用して共通化
sigprogramming Jan 18, 2025
382b8e7
SettingDialog.vueのトグルセルのタイトルと説明を更新
sigprogramming Jan 18, 2025
9a10b1b
emitImmediatelyを削除
sigprogramming Jan 18, 2025
6d1fe84
Update src/components/Sing/ScoreSequencer.vue
sigprogramming Jan 18, 2025
07172e5
Update src/components/Sing/SequencerParameterPanel.vue
sigprogramming Jan 18, 2025
43923d6
gridInfoInjectionKeyをScoreSequencer.vueに移動し、SequencerDummyGrid.vueおよび…
Hiroshiba Jan 19, 2025
ab02d28
CharacterPortrait.vueのスタイルを更新し、ポートレートの表示方法を改善
Hiroshiba Jan 19, 2025
247f059
(スナップショットを更新)
github-actions[bot] Jan 19, 2025
584791d
Merge pull request #4 from Hiroshiba/hiho-counter-pr-ab02d289
sigprogramming Jan 21, 2025
1436c64
chore: injectを移動
Hiroshiba Jan 21, 2025
672fc6e
Update src/components/Sing/SequencerDummyGrid.vue
sigprogramming Jan 22, 2025
adad0e2
Update src/components/Sing/SequencerGrid/Presentation.vue
sigprogramming Jan 22, 2025
7662a2f
Update src/components/Sing/SequencerDummyGrid.vue
sigprogramming Jan 22, 2025
8e05527
Merge branch 'add_parameter_panel_area' into hiho-counter-pr-372811ca
sigprogramming Jan 22, 2025
2342a8b
Merge pull request #5 from Hiroshiba/hiho-counter-pr-372811ca
sigprogramming Jan 22, 2025
519d9b1
CharacterPortrait.vueにクリッピングコンテナを追加し、画像のはみ出しを防止、pointer-events:noneを追加
sigprogramming Jan 22, 2025
b64096b
gridCellWidthとgridCellHeightの依存関係を削除し、ScoreSequencer.vueでの計算を直接行うように変更
sigprogramming Jan 22, 2025
fce1c16
Update src/components/Sing/CharacterPortrait.vue
sigprogramming Jan 23, 2025
39400f8
DummyGridからGridSpacerに変更
sigprogramming Jan 23, 2025
0e896dd
mainをマージ [update snapshots]
sigprogramming Jan 23, 2025
8495413
(スナップショットを更新)
github-actions[bot] Jan 23, 2025
b58632d
Merge remote-tracking branch 'upstream/main' into pr/sigprogramming/2472
Hiroshiba Jan 23, 2025
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
29 changes: 7 additions & 22 deletions src/components/Sing/CharacterPortrait.vue
Original file line number Diff line number Diff line change
Expand Up @@ -36,40 +36,25 @@ const portraitPath = computed(() => {
@use "@/styles/colors" as colors;

// 表示変数
$right-margin: 24px;
$portrait-min-width: 200px;
$portrait-max-width: 40vw;
$portrait-min-height: 500px;
$portrait-max-height: 60vh;

// 画面右下に固定表示
// 幅固定、高さ可変、画像のアスペクト比を保持、heightを調整
.character-portrait-wrap {
display: flex;
justify-content: flex-end;
align-items: flex-end;
position: sticky;
bottom: 0;
right: $right-margin;
height: 100%;
contain: strict;
pointer-events: none;
display: flex;
flex-direction: column;
margin-left: auto;
overflow: hidden;
}

// 通常は下部基準だが、親要素が最小高さより小さい場合は上部基準とし頭を残して足から隠れさせる
.character-portrait {
position: absolute;
// 通常は下部基準
bottom: 0;
// 親要素が最小高さより小さい場合は上部基準
top: max(0px, calc(100% - $portrait-min-height));
min-width: $portrait-min-width;
max-width: $portrait-max-width;
min-height: $portrait-min-height;
max-height: $portrait-max-height;
display: block;
margin-top: auto;
min-height: max(75%, $portrait-min-height);
opacity: 0.55;
backface-visibility: hidden;
object-fit: contain;
transform-origin: top;
}
</style>
sigprogramming marked this conversation as resolved.
Show resolved Hide resolved
Hiroshiba marked this conversation as resolved.
Show resolved Hide resolved
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