Skip to content

Commit 7a02f25

Browse files
committed
#176 レイヤー配分の準備
1 parent b559fd9 commit 7a02f25

4 files changed

Lines changed: 51 additions & 30 deletions

File tree

src/js/menu/application/ScreenMenu/service/ScreenMenuAllInactiveService.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ import {
55
$SCREEN_DISTRIBUTE_TO_LAYERS_ID,
66
$SCREEN_DISTRIBUTE_TO_KEYFRAMES_ID,
77
$SCREEN_ALIGN_COORDINATES_PREV_KEYFRAME_ID,
8+
$SCREEN_ALIGN_COORDINATES_NEXT_KEYFRAME_ID,
89
$SCREEN_ALIGN_MATRIX_PREV_KEYFRAME_ID,
10+
$SCREEN_ALIGN_MATRIX_NEXT_KEYFRAME_ID,
911
$SCREEN_INTEGRATING_PATHS_ID,
1012
$SCREEN_ADD_TWEEN_CURVE_POINTER_ID,
1113
$SCREEN_DELETE_TWEEN_CURVE_POINTER_ID,
@@ -29,7 +31,9 @@ export const execute = (): void =>
2931
$SCREEN_DISTRIBUTE_TO_LAYERS_ID,
3032
$SCREEN_DISTRIBUTE_TO_KEYFRAMES_ID,
3133
$SCREEN_ALIGN_COORDINATES_PREV_KEYFRAME_ID,
34+
$SCREEN_ALIGN_COORDINATES_NEXT_KEYFRAME_ID,
3235
$SCREEN_ALIGN_MATRIX_PREV_KEYFRAME_ID,
36+
$SCREEN_ALIGN_MATRIX_NEXT_KEYFRAME_ID,
3337
$SCREEN_INTEGRATING_PATHS_ID,
3438
$SCREEN_ADD_TWEEN_CURVE_POINTER_ID,
3539
$SCREEN_DELETE_TWEEN_CURVE_POINTER_ID,

src/js/menu/application/ScreenMenu/service/ScreenMenuUpdateStylePrevKeyframeCoordsService.ts

Lines changed: 0 additions & 28 deletions
This file was deleted.
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
import type { MovieClip } from "@/core/domain/model/MovieClip";
2+
import {
3+
$SCREEN_ALIGN_COORDINATES_NEXT_KEYFRAME_ID,
4+
$SCREEN_ALIGN_COORDINATES_PREV_KEYFRAME_ID,
5+
$SCREEN_ALIGN_MATRIX_NEXT_KEYFRAME_ID,
6+
$SCREEN_ALIGN_MATRIX_PREV_KEYFRAME_ID
7+
} from "@/config/ScreenConfig";
8+
9+
/**
10+
* @description スクリーンのメニューを選択中のElementに合わせてアクティブ・非アクティブに更新する
11+
* Update the screen menu to be active/inactive according to the selected Element
12+
*
13+
* @return {void}
14+
* @method
15+
* @public
16+
*/
17+
export const execute = (movie_clip: MovieClip): void =>
18+
{
19+
const ids = [
20+
$SCREEN_ALIGN_COORDINATES_PREV_KEYFRAME_ID,
21+
$SCREEN_ALIGN_COORDINATES_NEXT_KEYFRAME_ID,
22+
$SCREEN_ALIGN_MATRIX_PREV_KEYFRAME_ID,
23+
$SCREEN_ALIGN_MATRIX_NEXT_KEYFRAME_ID
24+
];
25+
26+
const show = movie_clip.selectedDepths.size > 0;
27+
for (let idx = 0; idx < ids.length; idx++) {
28+
29+
// 単独選択時の表示
30+
const element: HTMLElement | null = document
31+
.getElementById(ids[idx]) as HTMLElement;
32+
33+
if (!element) {
34+
continue;
35+
}
36+
37+
// 選択しているDisplayObjectがある場合はボタンをアクティブにする
38+
if (show) {
39+
element.setAttribute("style", "");
40+
} else {
41+
element.style.opacity = "0.5";
42+
element.style.pointerEvents = "none";
43+
}
44+
}
45+
};

src/js/menu/application/ScreenMenu/usecase/ScreenMenuUpdateActiveElementUseCase.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { execute as screenMenuAllInactiveService } from "../service/ScreenMenuAl
33
import { execute as screenMenuUpdateStyleSubMenuService } from "../service/ScreenMenuUpdateStyleSubMenuService";
44
import { execute as screenMenuUpdateStyleEditMovieClipService } from "../service/ScreenMenuUpdateStyleEditMovieClipService";
55
import { execute as screenMenuUpdateStyleMoveParentMovieClipService } from "../service/ScreenMenuUpdateStyleMoveParentMovieClipService";
6-
import { execute as screenMenuUpdateStylePrevKeyframeCoordsService } from "../service/ScreenMenuUpdateStylePrevKeyframeCoordsService";
6+
import { execute as screenMenuUpdateStylePrevNextKeyframeService } from "../service/ScreenMenuUpdateStylePrevNextKeyframeService";
77

88
/**
99
* @description スクリーンのメニューを選択中のElementに合わせてアクティブ・非アクティブに更新する
@@ -29,7 +29,7 @@ export const execute = (): void =>
2929
screenMenuUpdateStyleEditMovieClipService(movieClip);
3030

3131
// 前のキーフレームの座標に合わせるボタンのスタイルを更新
32-
screenMenuUpdateStylePrevKeyframeCoordsService(movieClip);
32+
screenMenuUpdateStylePrevNextKeyframeService(movieClip);
3333
}
3434

3535
// 親のMovieClipへの移動ボタンのスタイルを更新

0 commit comments

Comments
 (0)