Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2025-12-16 11:48:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix conflict and spelling check

Browse Source
This commit is contained in:
Leilei Zhang
2025-12-05 10:41:42 +08:00
parent 0e93343cba
commit d987d37fff
3 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/actions/spell-check/expect.txt vendored
View File

@@ -1481,6 +1481,7 @@ rgh
rgn rgn
rgs rgs
rguid rguid
rhk
RIDEV RIDEV
RIGHTSCROLLBAR RIGHTSCROLLBAR
riid riid
@@ -1586,6 +1587,7 @@ SHGDNF
SHGFI SHGFI
SHIL SHIL
shinfo shinfo
shk
shlwapi shlwapi
shobjidl shobjidl
SHORTCUTATLEAST SHORTCUTATLEAST

4
PowerToys.slnx
View File

@@ -370,6 +370,10 @@
<Platform Solution="*|x64" Project="x64" /> <Platform Solution="*|x64" Project="x64" />
</Project> </Project>
<Project Path="src/modules/fancyzones/FancyZones/FancyZones.vcxproj" Id="ff1d7936-842a-4bbb-8bea-e9fe796de700" /> <Project Path="src/modules/fancyzones/FancyZones/FancyZones.vcxproj" Id="ff1d7936-842a-4bbb-8bea-e9fe796de700" />
<Project Path="src/modules/fancyzones/FancyZonesCLI/FancyZonesCLI.csproj">
<Platform Solution="*|ARM64" Project="ARM64" />
<Platform Solution="*|x64" Project="x64" />
</Project>
<Project Path="src/modules/fancyzones/FancyZonesEditorCommon/FancyZonesEditorCommon.csproj"> <Project Path="src/modules/fancyzones/FancyZonesEditorCommon/FancyZonesEditorCommon.csproj">
<Platform Solution="*|ARM64" Project="ARM64" /> <Platform Solution="*|ARM64" Project="ARM64" />
<Platform Solution="*|x64" Project="x64" /> <Platform Solution="*|x64" Project="x64" />

2
src/modules/fancyzones/FancyZonesCLI/LayoutVisualizer.cs
View File

@@ -148,7 +148,7 @@ public static class LayoutVisualizer
} }
else else
{ {
// > 11 zones: fallback to grid layout // > 11 zones: use grid layout
int rows = 1; int rows = 1;
while (zoneCount / rows >= rows) while (zoneCount / rows >= rows)
{ {