Skip to content

Commit c68dfbf

Browse files
jayfuncjayfunc
committed
chore
1 parent 74c8fbf commit c68dfbf

26 files changed

Lines changed: 293 additions & 27 deletions

‎BetterLyrics.WinUI3 (Package)/BetterLyrics.WinUI3 (Package).wapproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
<AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
4747
<AppxAutoIncrementPackageRevision>True</AppxAutoIncrementPackageRevision>
4848
<GenerateTestArtifacts>True</GenerateTestArtifacts>
49-
<AppxBundlePlatforms>x86|x64</AppxBundlePlatforms>
49+
<AppxBundlePlatforms>x64</AppxBundlePlatforms>
5050
<GenerateTemporaryStoreCertificate>True</GenerateTemporaryStoreCertificate>
5151
<HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
5252
<PackageCertificateThumbprint>A014CF74C859DC3C06BCEF563C4CE86229AF1C21</PackageCertificateThumbprint>
@@ -145,6 +145,7 @@
145145
<ItemGroup>
146146
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.7705" />
147147
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.8.260209005" />
148+
<PackageReference Include="SpoutDx.Net.Interop" Version="0.2.0" />
148149
</ItemGroup>
149150
<Import Project="$(WapProjPath)\Microsoft.DesktopBridge.targets" />
150151
</Project>

‎BetterLyrics.WinUI3 (Package)/Package.appxmanifest‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<Identity
1313
Name="37412.BetterLyrics"
1414
Publisher="CN=Zhe"
15-
Version="1.2.354.0" />
15+
Version="1.2.357.0" />
1616

1717
<mp:PhoneIdentity PhoneProductId="ca4a4830-fc19-40d9-b823-53e2bff3d816" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
1818

‎BetterLyrics.WinUI3/BetterLyrics.WinUI3.csproj‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -133,40 +133,40 @@
133133
<PackageReference Include="Interop.UIAutomationClient" Version="10.19041.0" />
134134
<PackageReference Include="LiteFM" Version="1.0.2" />
135135
<PackageReference Include="LiveChartsCore.SkiaSharpView.WinUI" Version="2.0.0-rc6.1" />
136-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.3" />
137-
<PackageReference Include="Microsoft.EntityFrameworkCore.Abstractions" Version="10.0.3" />
138-
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.3" />
139-
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.3" />
140-
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.3">
136+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.5" />
137+
<PackageReference Include="Microsoft.EntityFrameworkCore.Abstractions" Version="10.0.5" />
138+
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.5" />
139+
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.5" />
140+
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.5">
141141
<PrivateAssets>all</PrivateAssets>
142142
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
143143
</PackageReference>
144-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.3" />
145-
<PackageReference Include="Microsoft.Extensions.Logging" Version="10.0.3" />
144+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.5" />
145+
<PackageReference Include="Microsoft.Extensions.Logging" Version="10.0.5" />
146146
<PackageReference Include="Microsoft.Graphics.Win2D" Version="1.3.2" />
147147
<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.14.15">
148148
<PrivateAssets>all</PrivateAssets>
149149
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
150150
</PackageReference>
151151
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.7705" />
152152
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.8.260209005" />
153-
<PackageReference Include="NAudio.Wasapi" Version="2.2.1" />
153+
<PackageReference Include="NAudio.Wasapi" Version="2.3.0" />
154154
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
155155
<PackageReference Include="NTextCat" Version="0.3.65" />
156156
<PackageReference Include="QRCoder" Version="1.7.0" />
157157
<PackageReference Include="Serilog.Extensions.Logging" Version="10.0.0" />
158158
<PackageReference Include="Serilog.Sinks.File" Version="7.0.0" />
159-
<PackageReference Include="SMBLibrary" Version="1.5.5.2" />
160-
<PackageReference Include="SpoutDx.Net.Interop" Version="0.2.0" />
161-
<PackageReference Include="System.Drawing.Common" Version="10.0.3" />
162-
<PackageReference Include="System.IO.Hashing" Version="10.0.3" />
159+
<PackageReference Include="SMBLibrary" Version="1.5.6" />
160+
<PackageReference Include="SpoutDx.Net.Interop.MultiPlatform" Version="0.1.0" />
161+
<PackageReference Include="System.Drawing.Common" Version="10.0.5" />
162+
<PackageReference Include="System.IO.Hashing" Version="10.0.5" />
163163
<PackageReference Include="TagLibSharp" Version="2.3.0" />
164164
<PackageReference Include="Ude.NetStandard" Version="1.2.0" />
165-
<PackageReference Include="Vanara.PInvoke.DwmApi" Version="5.0.0" />
166-
<PackageReference Include="Vanara.PInvoke.Gdi32" Version="5.0.0" />
167-
<PackageReference Include="Vanara.PInvoke.Shell32" Version="5.0.0" />
168-
<PackageReference Include="Vanara.PInvoke.User32" Version="5.0.0" />
169-
<PackageReference Include="Vanara.Windows.Shell" Version="5.0.0" />
165+
<PackageReference Include="Vanara.PInvoke.DwmApi" Version="5.0.1" />
166+
<PackageReference Include="Vanara.PInvoke.Gdi32" Version="5.0.1" />
167+
<PackageReference Include="Vanara.PInvoke.Shell32" Version="5.0.1" />
168+
<PackageReference Include="Vanara.PInvoke.User32" Version="5.0.1" />
169+
<PackageReference Include="Vanara.Windows.Shell" Version="5.0.1" />
170170
<PackageReference Include="VCollab.DiscordRichPresence" Version="1.7.0" />
171171
<PackageReference Include="Vortice.Direct3D11" Version="3.8.3" />
172172
<PackageReference Include="WanaKana-net" Version="1.0.0" />

‎BetterLyrics.WinUI3/Controls/WindowSettingsControl.xaml‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -121,34 +121,38 @@
121121
</ComboBox>
122122
</controls:SettingsCard>
123123
<!-- 边缘羽化 -->
124-
<controls:SettingsExpander Header="Edge Feathering" HeaderIcon="{ui:FontIcon FontFamily={StaticResource SegoeFluentIcons}, Glyph=&#xE950;}">
124+
<controls:SettingsExpander x:Uid="WindowSettingsControlEdgeFeathering" HeaderIcon="{ui:FontIcon FontFamily={StaticResource SegoeFluentIcons}, Glyph=&#xE950;}">
125125
<controls:SettingsExpander.Items>
126-
<controls:SettingsCard Header="Left">
126+
<controls:SettingsCard x:Uid="WindowSettingsControlEdgeFeatheringLeft">
127127
<local:ExtendedSlider
128128
Default="0"
129129
Maximum="100"
130130
Minimum="0"
131+
Unit="%"
131132
Value="{x:Bind LyricsWindowStatus.EdgeFeatheringLeft, Mode=TwoWay}" />
132133
</controls:SettingsCard>
133-
<controls:SettingsCard Header="Top">
134+
<controls:SettingsCard x:Uid="WindowSettingsControlEdgeFeatheringTop">
134135
<local:ExtendedSlider
135136
Default="0"
136137
Maximum="100"
137138
Minimum="0"
139+
Unit="%"
138140
Value="{x:Bind LyricsWindowStatus.EdgeFeatheringTop, Mode=TwoWay}" />
139141
</controls:SettingsCard>
140-
<controls:SettingsCard Header="Right">
142+
<controls:SettingsCard x:Uid="WindowSettingsControlEdgeFeatheringRight">
141143
<local:ExtendedSlider
142144
Default="0"
143145
Maximum="100"
144146
Minimum="0"
147+
Unit="%"
145148
Value="{x:Bind LyricsWindowStatus.EdgeFeatheringRight, Mode=TwoWay}" />
146149
</controls:SettingsCard>
147-
<controls:SettingsCard Header="Bottom">
150+
<controls:SettingsCard x:Uid="WindowSettingsControlEdgeFeatheringBottom">
148151
<local:ExtendedSlider
149152
Default="0"
150153
Maximum="100"
151154
Minimum="0"
155+
Unit="%"
152156
Value="{x:Bind LyricsWindowStatus.EdgeFeatheringBottom, Mode=TwoWay}" />
153157
</controls:SettingsCard>
154158
</controls:SettingsExpander.Items>

‎BetterLyrics.WinUI3/Extensions/LyricsWindowStatusExtensions.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,7 @@ public static LyricsWindowStatus WallpaperMode(Window? window = null)
145145
LyricsDisplayType = LyricsDisplayType.LyricsOnly,
146146
WindowBounds = new Rect(100, 100, 600, 250),
147147
IsWallpaper = true,
148+
IsLocked = true,
148149
IsAlwaysOnTop = true,
149150
IsAlwaysOnTopPolling = true,
150151
IsAdaptToEnvironment = true,

‎BetterLyrics.WinUI3/Hooks/WindowHook.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,6 @@ public static T OpenOrShowWindow<T>(LyricsWindowStatus? status = null)
193193
{
194194
var castedWindow = (Window)window;
195195
castedWindow.Activate();
196-
castedWindow.AppWindow.MoveInZOrderAtTop();
197196
}
198197

199198
if (typeof(T) == typeof(NowPlayingWindow))

‎BetterLyrics.WinUI3/Renderer/CompositionRenderer.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
namespace BetterLyrics.WinUI3.Renderer
88
{
9-
public class CompositionRenderer : IDisposable
9+
public partial class CompositionRenderer : IDisposable
1010
{
1111
private CanvasRenderTarget? _renderTarget;
1212

‎BetterLyrics.WinUI3/Renderer/EdgeFadeMaskRenderer.cs‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,13 @@ public partial class EdgeFadeMaskRenderer : IDisposable
2222
public CanvasImageBrush? Brush => _maskBrush;
2323

2424
public void Update(ICanvasResourceCreator resourceCreator, float width, float height,
25-
float fadeLeft, float fadeTop, float fadeRight, float fadeBottom)
25+
float fadeLeftPercentage, float fadeTopPercentage, float fadeRightPercentage, float fadeBottomPercentage)
2626
{
27+
float fadeLeft = (fadeLeftPercentage / 100f) * (width / 2f);
28+
float fadeTop = (fadeTopPercentage / 100f) * (height / 2f);
29+
float fadeRight = (fadeRightPercentage / 100f) * (width / 2f);
30+
float fadeBottom = (fadeBottomPercentage / 100f) * (height / 2f);
31+
2732
if (Math.Abs(_lastWidth - width) < 0.1f && Math.Abs(_lastHeight - height) < 0.1f &&
2833
Math.Abs(_lastTop - fadeTop) < 0.1f && Math.Abs(_lastBottom - fadeBottom) < 0.1f &&
2934
Math.Abs(_lastLeft - fadeLeft) < 0.1f && Math.Abs(_lastRight - fadeRight) < 0.1f &&

‎BetterLyrics.WinUI3/Strings/ar/Resources.resw‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -945,6 +945,9 @@
945945
<data name="SettingsPageBlurAmount.Header" xml:space="preserve">
946946
<value>كمية الضبابية (Blur)</value>
947947
</data>
948+
<data name="WindowSettingsControlEdgeFeatheringBottom.Header" xml:space="preserve">
949+
<value>القاع</value>
950+
</data>
948951
<data name="SettingsPageCache.Description" xml:space="preserve">
949952
<value>يتضمن ملفات السجلات، وذاكرة التخزين المؤقت للكلمات عبر الإنترنت</value>
950953
</data>
@@ -1254,6 +1257,9 @@
12541257
<data name="SettingsPageLeft.Content" xml:space="preserve">
12551258
<value>يسار</value>
12561259
</data>
1260+
<data name="WindowSettingsControlEdgeFeatheringLeft.Header" xml:space="preserve">
1261+
<value>يسار</value>
1262+
</data>
12571263
<data name="SettingsPageLibreTranslateServer.Header" xml:space="preserve">
12581264
<value>عنوان الخادم</value>
12591265
</data>
@@ -1935,6 +1941,9 @@
19351941
<data name="WindowSettingsControlDebug.Text" xml:space="preserve">
19361942
<value>التصحيح</value>
19371943
</data>
1944+
<data name="WindowSettingsControlEdgeFeathering.Header" xml:space="preserve">
1945+
<value>ميزة الحافة</value>
1946+
</data>
19381947
<data name="WindowSettingsControlLockAndUnlock.Text" xml:space="preserve">
19391948
<value>قفل وفتح القفل</value>
19401949
</data>
@@ -1962,4 +1971,10 @@
19621971
<data name="WindowSettingsControlTheme.Header" xml:space="preserve">
19631972
<value>سمة النافذة</value>
19641973
</data>
1974+
<data name="WindowSettingsControlEdgeFeatheringTop.Header" xml:space="preserve">
1975+
<value>أعلى</value>
1976+
</data>
1977+
<data name="WindowSettingsControlEdgeFeatheringRight.Header" xml:space="preserve">
1978+
<value>صحيح</value>
1979+
</data>
19651980
</root>

‎BetterLyrics.WinUI3/Strings/de/Resources.resw‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -945,6 +945,9 @@
945945
<data name="SettingsPageBlurAmount.Header" xml:space="preserve">
946946
<value>Unschärfe-Stärke</value>
947947
</data>
948+
<data name="WindowSettingsControlEdgeFeatheringBottom.Header" xml:space="preserve">
949+
<value>Unten</value>
950+
</data>
948951
<data name="SettingsPageCache.Description" xml:space="preserve">
949952
<value>Enthält Protokolldateien, Online-Liedtext-Cache</value>
950953
</data>
@@ -1254,6 +1257,9 @@
12541257
<data name="SettingsPageLeft.Content" xml:space="preserve">
12551258
<value>Links</value>
12561259
</data>
1260+
<data name="WindowSettingsControlEdgeFeatheringLeft.Header" xml:space="preserve">
1261+
<value>Links</value>
1262+
</data>
12571263
<data name="SettingsPageLibreTranslateServer.Header" xml:space="preserve">
12581264
<value>Serveradresse</value>
12591265
</data>
@@ -1935,6 +1941,9 @@
19351941
<data name="WindowSettingsControlDebug.Text" xml:space="preserve">
19361942
<value>Debuggen</value>
19371943
</data>
1944+
<data name="WindowSettingsControlEdgeFeathering.Header" xml:space="preserve">
1945+
<value>Kantenfederung</value>
1946+
</data>
19381947
<data name="WindowSettingsControlLockAndUnlock.Text" xml:space="preserve">
19391948
<value>Sperren und Entsperren</value>
19401949
</data>
@@ -1962,4 +1971,10 @@
19621971
<data name="WindowSettingsControlTheme.Header" xml:space="preserve">
19631972
<value>Fenster-Thema</value>
19641973
</data>
1974+
<data name="WindowSettingsControlEdgeFeatheringTop.Header" xml:space="preserve">
1975+
<value>Top</value>
1976+
</data>
1977+
<data name="WindowSettingsControlEdgeFeatheringRight.Header" xml:space="preserve">
1978+
<value>Rechts</value>
1979+
</data>
19651980
</root>

0 commit comments

Comments
 (0)