diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3 (Package)/Package.appxmanifest b/BetterLyrics.WinUI3/BetterLyrics.WinUI3 (Package)/Package.appxmanifest index 4f91db1..c33fe48 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3 (Package)/Package.appxmanifest +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3 (Package)/Package.appxmanifest @@ -12,7 +12,7 @@ + Version="1.0.111.0" /> diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/LiveStatesService/LiveStatesService.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/LiveStatesService/LiveStatesService.cs index a85959e..565a9a4 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/LiveStatesService/LiveStatesService.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/LiveStatesService/LiveStatesService.cs @@ -78,8 +78,6 @@ namespace BetterLyrics.WinUI3.Services.LiveStatesService private async void LyricsWindowStatus_PropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e) { - LiveStates.IsLyricsWindowStatusRefreshing = true; - switch (e.PropertyName) { case nameof(LyricsWindowStatus.IsWorkArea): @@ -134,8 +132,6 @@ namespace BetterLyrics.WinUI3.Services.LiveStatesService default: break; } - - LiveStates.IsLyricsWindowStatusRefreshing = false; } public void Receive(PropertyChangedMessage message) diff --git a/ShareHub/LyricsWindowStatus/desktop.json b/ShareHub/LyricsWindowStatus/desktop.json index 6f5dc5d..d3156ee 100644 --- a/ShareHub/LyricsWindowStatus/desktop.json +++ b/ShareHub/LyricsWindowStatus/desktop.json @@ -132,7 +132,7 @@ "CoverOverlayOpacity": 100, "CoverOverlaySpeed": 50, "CoverAcrylicEffectAmount": 0, - "IsFluidOverlayEnabled": true, + "IsFluidOverlayEnabled": false, "FluidOverlayOpacity": 100, "PaletteGeneratorType": 0, "IsSpectrumOverlayEnabled": false, diff --git a/ShareHub/LyricsWindowStatus/docked-bottom.json b/ShareHub/LyricsWindowStatus/docked-bottom.json index f48a23f..55d48b0 100644 --- a/ShareHub/LyricsWindowStatus/docked-bottom.json +++ b/ShareHub/LyricsWindowStatus/docked-bottom.json @@ -12,25 +12,25 @@ "LyricsDisplayType": 1, "WindowBounds": { "X": 0, - "Y": -1, + "Y": 1015, "Width": 1920, "Height": 65, "Left": 0, - "Top": -1, + "Top": 1015, "Right": 1920, - "Bottom": 64, + "Bottom": 1080, "IsEmpty": false }, "DockHeight": 64, "DemoWindowBounds": { "X": 0, - "Y": -0.10000000149011612, + "Y": 101.5, "Width": 192, "Height": 6.5, "Left": 0, - "Top": -0.10000000149011612, + "Top": 101.5, "Right": 192, - "Bottom": 6.400000095367432, + "Bottom": 108, "IsEmpty": false }, "MonitorBounds": { @@ -55,7 +55,7 @@ "Bottom": 108, "IsEmpty": false }, - "DockPlacement": 0, + "DockPlacement": 1, "LyricsStyleSettings": { "IsDynamicLyricsFontSize": true, "PhoneticLyricsFontSize": 12, @@ -125,14 +125,14 @@ }, "LyricsBackgroundSettings": { "LyricsBackgroundTheme": 2, - "IsPureColorOverlayEnabled": false, + "IsPureColorOverlayEnabled": true, "PureColorOverlayOpacity": 100, "IsCoverOverlayEnabled": false, "CoverOverlayBlurAmount": 100, "CoverOverlayOpacity": 100, "CoverOverlaySpeed": 50, "CoverAcrylicEffectAmount": 0, - "IsFluidOverlayEnabled": true, + "IsFluidOverlayEnabled": false, "FluidOverlayOpacity": 100, "PaletteGeneratorType": 0, "IsSpectrumOverlayEnabled": false, @@ -157,7 +157,7 @@ "AutoShowOrHideWindow": false, "TitleBarArea": 0, "WindowX": 0, - "WindowY": -1, + "WindowY": 1015, "WindowWidth": 1920, "WindowHeight": 65, "IsActive": false diff --git a/ShareHub/LyricsWindowStatus/docked-top.json b/ShareHub/LyricsWindowStatus/docked-top.json index f2d6041..877a42d 100644 --- a/ShareHub/LyricsWindowStatus/docked-top.json +++ b/ShareHub/LyricsWindowStatus/docked-top.json @@ -125,14 +125,14 @@ }, "LyricsBackgroundSettings": { "LyricsBackgroundTheme": 2, - "IsPureColorOverlayEnabled": false, + "IsPureColorOverlayEnabled": true, "PureColorOverlayOpacity": 100, "IsCoverOverlayEnabled": false, "CoverOverlayBlurAmount": 100, "CoverOverlayOpacity": 100, "CoverOverlaySpeed": 50, "CoverAcrylicEffectAmount": 0, - "IsFluidOverlayEnabled": true, + "IsFluidOverlayEnabled": false, "FluidOverlayOpacity": 100, "PaletteGeneratorType": 0, "IsSpectrumOverlayEnabled": false, diff --git a/ShareHub/LyricsWindowStatus/fs-horiz.json b/ShareHub/LyricsWindowStatus/fs-horiz.json index 29cbd39..a247550 100644 --- a/ShareHub/LyricsWindowStatus/fs-horiz.json +++ b/ShareHub/LyricsWindowStatus/fs-horiz.json @@ -4,7 +4,7 @@ "MonitorDeviceName": "\\\\.\\DISPLAY1", "IsWorkArea": false, "IsBorderless": true, - "IsAlwaysOnTop": false, + "IsAlwaysOnTop": true, "IsAlwaysOnTopPolling": false, "IsShownInSwitchers": true, "IsClickThrough": false, diff --git a/ShareHub/LyricsWindowStatus/fs-vert.json b/ShareHub/LyricsWindowStatus/fs-vert.json index cd2ee8b..9f2be27 100644 --- a/ShareHub/LyricsWindowStatus/fs-vert.json +++ b/ShareHub/LyricsWindowStatus/fs-vert.json @@ -4,7 +4,7 @@ "MonitorDeviceName": "\\\\.\\DISPLAY1", "IsWorkArea": false, "IsBorderless": true, - "IsAlwaysOnTop": false, + "IsAlwaysOnTop": true, "IsAlwaysOnTopPolling": false, "IsShownInSwitchers": true, "IsClickThrough": false, diff --git a/ShareHub/LyricsWindowStatus/narrow.json b/ShareHub/LyricsWindowStatus/narrow.json new file mode 100644 index 0000000..6abf499 --- /dev/null +++ b/ShareHub/LyricsWindowStatus/narrow.json @@ -0,0 +1,164 @@ +{ + "Name": "\u7A84\u5C4F\u6A21\u5F0F", + "IsDefault": false, + "MonitorDeviceName": "\\\\.\\DISPLAY1", + "IsWorkArea": false, + "IsBorderless": false, + "IsAlwaysOnTop": false, + "IsAlwaysOnTopPolling": false, + "IsShownInSwitchers": true, + "IsClickThrough": false, + "LyricsLayoutOrientation": 1, + "LyricsDisplayType": 2, + "WindowBounds": { + "X": 100, + "Y": 100, + "Width": 400, + "Height": 800, + "Left": 100, + "Top": 100, + "Right": 500, + "Bottom": 900, + "IsEmpty": false + }, + "DockHeight": 64, + "DemoWindowBounds": { + "X": 10, + "Y": 10, + "Width": 40, + "Height": 80, + "Left": 10, + "Top": 10, + "Right": 50, + "Bottom": 90, + "IsEmpty": false + }, + "MonitorBounds": { + "X": 0, + "Y": 0, + "Width": 1920, + "Height": 1080, + "Left": 0, + "Top": 0, + "Right": 1920, + "Bottom": 1080, + "IsEmpty": false + }, + "DemoMonitorBounds": { + "X": 0, + "Y": 0, + "Width": 192, + "Height": 108, + "Left": 0, + "Top": 0, + "Right": 192, + "Bottom": 108, + "IsEmpty": false + }, + "DockPlacement": 0, + "LyricsStyleSettings": { + "IsDynamicLyricsFontSize": true, + "PhoneticLyricsFontSize": 12, + "OriginalLyricsFontSize": 24, + "TranslatedLyricsFontSize": 12, + "LyricsAlignmentType": 0, + "LyricsBgFontOpacity": 30, + "LyricsFontStrokeWidth": 0, + "LyricsCustomBgFontColor": { + "A": 255, + "R": 255, + "G": 255, + "B": 255 + }, + "LyricsCustomFgFontColor": { + "A": 255, + "R": 255, + "G": 255, + "B": 255 + }, + "LyricsCustomStrokeFontColor": { + "A": 255, + "R": 255, + "G": 255, + "B": 255 + }, + "LyricsBgFontColorType": 1, + "LyricsFgFontColorType": 1, + "LyricsStrokeFontColorType": 1, + "LyricsFontWeight": 7, + "LyricsLineSpacingFactor": 0.5, + "LyricsTranslationSeparator": "\n", + "LyricsCJKFontFamily": "Arial", + "LyricsWesternFontFamily": "Arial", + "IsActive": false + }, + "LyricsEffectSettings": { + "LyricsBlurAmount": 5, + "IsLyricsLineFadeEnabled": true, + "IsLyricsGlowEffectEnabled": true, + "LyricsGlowEffectScope": 0, + "LyricsGlowEffectAmount": 8, + "IsLyricsShadowEnabled": false, + "LyricsShadowScope": 1, + "LyricsShadowAmount": 8, + "OriginalLyricsHighlightScope": 1, + "PhoneticLyricsHighlightAmount": 60, + "OriginalLyricsHighlightAmount": 100, + "TranslatedLyricsHighlightAmount": 60, + "IsLyricsFloatAnimationEnabled": true, + "LyricsFloatAmount": 1, + "LyricsScrollEasingType": 3, + "LyricsScrollDuration": 500, + "LyricsScrollTopDuration": 500, + "LyricsScrollBottomDuration": 500, + "LyricsScrollTopDelay": 0, + "LyricsScrollBottomDelay": 0, + "LyricsVerticalEdgeOpacity": 0, + "IsFanLyricsEnabled": false, + "FanLyricsAngle": 30, + "Is3DLyricsEnabled": false, + "Lyrics3DXAngle": 30, + "Lyrics3DYAngle": 0, + "Lyrics3DZAngle": 0, + "Lyrics3DDepth": 1000, + "IsActive": false + }, + "LyricsBackgroundSettings": { + "LyricsBackgroundTheme": 2, + "IsPureColorOverlayEnabled": false, + "PureColorOverlayOpacity": 100, + "IsCoverOverlayEnabled": false, + "CoverOverlayBlurAmount": 100, + "CoverOverlayOpacity": 100, + "CoverOverlaySpeed": 50, + "CoverAcrylicEffectAmount": 0, + "IsFluidOverlayEnabled": true, + "FluidOverlayOpacity": 100, + "PaletteGeneratorType": 0, + "IsSpectrumOverlayEnabled": false, + "IsSnowFlakeOverlayEnabled": false, + "SnowFlakeOverlayAmount": 50, + "IsActive": false + }, + "AlbumArtLayoutSettings": { + "SongInfoAlignmentType": 0, + "CoverImageRadius": 12, + "CoverImageShadowAmount": 12, + "IsAutoSongInfoFontSize": true, + "SongInfoFontSize": 18, + "ShowTitle": true, + "ShowArtists": true, + "AlbumArtSize": 64, + "AutoAlbumArtSize": true, + "IsActive": false + }, + "IsAdaptToEnvironment": false, + "EnvironmentSampleMode": 3, + "AutoShowOrHideWindow": false, + "TitleBarArea": 1, + "WindowX": 100, + "WindowY": 100, + "WindowWidth": 400, + "WindowHeight": 800, + "IsActive": false +} \ No newline at end of file