-
Notifications
You must be signed in to change notification settings - Fork 16
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1631 from andy840119/implement-view-only-lyric
Separate editable and view-only into two different lyric.
- Loading branch information
Showing
20 changed files
with
163 additions
and
109 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
97 changes: 9 additions & 88 deletions
97
osu.Game.Rulesets.Karaoke/Edit/Lyrics/Components/Lyrics/EditableLyric.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,117 +1,38 @@ | ||
| // Copyright (c) andy840119 <[email protected]>. Licensed under the GPL Licence. | ||
| // See the LICENCE file in the repository root for full licence text. | ||
|
|
||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.Linq; | ||
| using osu.Framework.Allocation; | ||
| using osu.Framework.Bindables; | ||
| using osu.Framework.Extensions.IEnumerableExtensions; | ||
| using osu.Framework.Graphics; | ||
| using osu.Framework.Graphics.Containers; | ||
| using osu.Framework.Graphics.Cursor; | ||
| using osu.Framework.Localisation; | ||
| using osu.Game.Rulesets.Karaoke.Edit.Utils; | ||
| using osu.Game.Rulesets.Karaoke.Objects; | ||
| using osu.Game.Screens.Edit; | ||
|
|
||
| namespace osu.Game.Rulesets.Karaoke.Edit.Lyrics.Components.Lyrics | ||
| { | ||
| [Cached(typeof(IEditableLyricState))] | ||
| public class EditableLyric : CompositeDrawable, IEditableLyricState, IHasTooltip | ||
| public class EditableLyric : InteractableLyric, IEditableLyricState | ||
| { | ||
| [Cached] | ||
| private readonly EditorKaraokeSpriteText karaokeSpriteText; | ||
|
|
||
| private readonly IBindable<LyricEditorMode> bindableMode = new Bindable<LyricEditorMode>(); | ||
| private readonly IBindable<int> bindableLyricPropertyWritableVersion; | ||
|
|
||
| private readonly Lyric lyric; | ||
| private LocalisableString? lockReason; | ||
|
|
||
| public EditableLyric(Lyric lyric) | ||
| : base(lyric) | ||
| { | ||
| this.lyric = lyric; | ||
|
|
||
| bindableLyricPropertyWritableVersion = lyric.LyricPropertyWritableVersion.GetBoundCopy(); | ||
|
|
||
| CornerRadius = 5; | ||
| Padding = new MarginPadding { Bottom = 10 }; | ||
| InternalChildren = new Drawable[] | ||
| } | ||
|
|
||
| protected override IEnumerable<BaseLayer> CreateLayers(Lyric lyric) | ||
| { | ||
| return new BaseLayer[] | ||
| { | ||
| new LyricLayer(lyric, karaokeSpriteText = new EditorKaraokeSpriteText(lyric)), | ||
| new TimeTagLayer(lyric), | ||
| new CaretLayer(lyric), | ||
| new BlueprintLayer(lyric), | ||
| }; | ||
|
|
||
| karaokeSpriteText.SizeChanged = () => | ||
| { | ||
| Height = karaokeSpriteText.DrawHeight; | ||
| }; | ||
|
|
||
| bindableMode.BindValueChanged(x => | ||
| { | ||
| triggerWritableVersionChanged(); | ||
| }); | ||
|
|
||
| bindableLyricPropertyWritableVersion.BindValueChanged(_ => | ||
| { | ||
| triggerWritableVersionChanged(); | ||
| }); | ||
| } | ||
|
|
||
| [BackgroundDependencyLoader] | ||
| private void load(EditorClock clock, ILyricEditorState state) | ||
| { | ||
| bindableMode.BindTo(state.BindableMode); | ||
| karaokeSpriteText.Clock = clock; | ||
| } | ||
|
|
||
| private void triggerWritableVersionChanged() | ||
| { | ||
| var loadReason = GetLyricPropertyLockedReason(lyric, bindableMode.Value); | ||
| lockReason = loadReason; | ||
|
|
||
| // adjust the style. | ||
| bool editable = lockReason == null; | ||
| InternalChildren.OfType<BaseLayer>().ForEach(x => x.UpdateDisableEditState(editable)); | ||
| } | ||
|
|
||
| public void TriggerDisallowEditEffect() | ||
| { | ||
| InternalChildren.OfType<BaseLayer>().ForEach(x => x.TriggerDisallowEditEffect(bindableMode.Value)); | ||
| } | ||
|
|
||
| public LocalisableString TooltipText => lockReason ?? string.Empty; | ||
|
|
||
| public static LocalisableString? GetLyricPropertyLockedReason(Lyric lyric, LyricEditorMode mode) | ||
| { | ||
| var reasons = getLyricPropertyLockedReasons(lyric, mode); | ||
|
|
||
| return reasons switch | ||
| { | ||
| LockLyricPropertyBy.ReferenceLyricConfig => "Cannot modify this property due to this lyric is property is sync from another lyric.", | ||
| LockLyricPropertyBy.LockState => "This property is locked and not editable", | ||
| null => default(LocalisableString?), | ||
| _ => throw new ArgumentOutOfRangeException() | ||
| }; | ||
| } | ||
|
|
||
| private static LockLyricPropertyBy? getLyricPropertyLockedReasons(Lyric lyric, LyricEditorMode mode) | ||
| { | ||
| return mode switch | ||
| { | ||
| LyricEditorMode.View => null, | ||
| LyricEditorMode.Texting => HitObjectWritableUtils.GetLyricPropertyLockedBy(lyric, nameof(Lyric.Text), nameof(Lyric.RubyTags), nameof(Lyric.RomajiTags), nameof(Lyric.TimeTags)), | ||
| LyricEditorMode.Reference => HitObjectWritableUtils.GetLyricPropertyLockedBy(lyric, nameof(Lyric.ReferenceLyric), nameof(Lyric.ReferenceLyricConfig)), | ||
| LyricEditorMode.Language => HitObjectWritableUtils.GetLyricPropertyLockedBy(lyric, nameof(Lyric.Language)), | ||
| LyricEditorMode.EditRuby => HitObjectWritableUtils.GetLyricPropertyLockedBy(lyric, nameof(Lyric.RubyTags)), | ||
| LyricEditorMode.EditRomaji => HitObjectWritableUtils.GetLyricPropertyLockedBy(lyric, nameof(Lyric.RomajiTags)), | ||
| LyricEditorMode.EditTimeTag => HitObjectWritableUtils.GetLyricPropertyLockedBy(lyric, nameof(Lyric.TimeTags)), | ||
| LyricEditorMode.EditNote => HitObjectWritableUtils.GetCreateOrRemoveNoteLockedBy(lyric), | ||
| LyricEditorMode.Singer => HitObjectWritableUtils.GetLyricPropertyLockedBy(lyric, nameof(Lyric.Singers)), | ||
| _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null) | ||
| }; | ||
| InternalChildren.OfType<BaseLayer>().ForEach(x => x.TriggerDisallowEditEffect(BindableMode.Value)); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.