Skip to content

Commit 375c35a

Browse files
d2phapd2phap
committed
Merge branch 'develop' into prod
2 parents 2aae767 + 38e7a68 commit 375c35a

File tree

9 files changed

+65
-62
lines changed

9 files changed

+65
-62
lines changed

‎Setup/AdvancedInstaller/ImageGlass_9_x64.aip‎

Lines changed: 37 additions & 43 deletions
Large diffs are not rendered by default.

‎Source/Components/ImageGlass.Base/ImageGlass.Base.csproj‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<ImplicitUsings>enable</ImplicitUsings>
88
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
99
<Platforms>x64;ARM64</Platforms>
10-
<Version>9.3.0.514</Version>
10+
<Version>9.3.1.518</Version>
1111
<FileVersion>$(Version)</FileVersion>
1212
<Copyright>Copyright © 2010 - 2025 Duong Dieu Phap</Copyright>
1313
<Configurations>Debug;Release;Publish_Release</Configurations>
@@ -84,8 +84,9 @@
8484
</ItemGroup>
8585

8686
<ItemGroup>
87-
<PackageReference Include="D2Phap.EggShell" Version="1.1.507" />
8887
<PackageReference Include="DirectNStandard" Version="1.17.2" />
88+
<PackageReference Include="D2Phap.EggShell-ARM64" Version="1.0.516" Condition="'$(Platform)' == 'ARM64'" />
89+
<PackageReference Include="D2Phap.EggShell-x64" Version="1.0.516" Condition="'$(Platform)' == 'X64'" />
8990
<PackageReference Include="Magick.NET-Q16-HDRI-OpenMP-arm64" Version="14.6.0" Condition="'$(Platform)' == 'ARM64'" />
9091
<PackageReference Include="Magick.NET-Q16-HDRI-OpenMP-x64" Version="14.6.0" Condition="'$(Platform)' == 'X64'" />
9192
<PackageReference Include="Magick.NET.SystemDrawing" Version="8.0.6" />

‎Source/Components/ImageGlass.Base/Photoing/Codecs/PhotoCodec.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -700,7 +700,7 @@ public static async Task SaveAsBase64Async(string srcFilePath, string destFilePa
700700
/// </summary>
701701
public static WicBitmapSource? TransformImage(WicBitmapSource? bmpSrc, ImgTransform? transform)
702702
{
703-
if (bmpSrc == null || transform == null) return null;
703+
if (bmpSrc == null || transform == null) return bmpSrc;
704704

705705
// list of flips
706706
var flips = new List<WICBitmapTransformOptions>();

‎Source/Components/ImageGlass.Settings/Config.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1923,13 +1923,14 @@ public static string BuildConfigCmdLine(string configName, object? configValue)
19231923
public static async Task SetDefaultPhotoViewerAsync(bool enable)
19241924
{
19251925
var extensions = Config.GetImageFormats(Config.FileFormats);
1926+
var scope = App.IsPortable ? "" : IgCommands.PER_MACHINE;
19261927

19271928
var cmd = enable
19281929
? IgCommands.SET_DEFAULT_PHOTO_VIEWER
19291930
: IgCommands.REMOVE_DEFAULT_PHOTO_VIEWER;
19301931

19311932
// run command and show the results
1932-
_ = await Config.RunIgcmd($"{cmd} {extensions} {IgCommands.PER_MACHINE} {IgCommands.SHOW_UI}");
1933+
_ = await Config.RunIgcmd($"{cmd} {extensions} {scope} {IgCommands.SHOW_UI}");
19331934
}
19341935

19351936

‎Source/Components/ImageGlass.Settings/ImageGlass.Settings.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,10 @@
7171
</ItemGroup>
7272

7373
<ItemGroup>
74-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.4" />
75-
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.4" />
76-
<PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="9.0.4" />
77-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.4" />
74+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.5" />
75+
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.5" />
76+
<PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="9.0.5" />
77+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.5" />
7878
</ItemGroup>
7979

8080
<ItemGroup>

‎Source/ImageGlass/FrmMain/FrmMain.PicMainEvents.cs‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,11 @@ private async Task HandlePicMainDragDropAsync(DragEventArgs e)
100100

101101

102102
// get foreground shell
103-
using var shell = new EggShell();
104-
Program.ForegroundShell = shell.GetForegroundWindowView();
103+
if (Config.ShouldUseExplorerSortOrder)
104+
{
105+
using var shell = new EggShell();
106+
Program.ForegroundShell = shell.GetForegroundWindowView();
107+
}
105108
Program.UpdateInputImagePath(filePath);
106109

107110

‎Source/ImageGlass/ImageGlass.csproj‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<Description>A lightweight, versatile image viewer</Description>
1515
<Copyright>Copyright © 2010 - 2025 Duong Dieu Phap</Copyright>
1616
<Company>Duong Dieu Phap</Company>
17-
<Version>9.3.0.514</Version>
17+
<Version>9.3.1.518</Version>
1818
<FileVersion>$(Version)</FileVersion>
1919

2020
<EntryPointExe>$(AssemblyName).exe</EntryPointExe>
@@ -170,14 +170,13 @@
170170
</ItemGroup>
171171

172172
<ItemGroup>
173-
<PackageReference Include="D2Phap.EggShell" Version="1.1.507" />
174173
<PackageReference Include="FileWatcherEx" Version="2.6.0" />
175174
<PackageReference Include="IDisposableAnalyzers" Version="4.0.8">
176175
<PrivateAssets>all</PrivateAssets>
177176
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
178177
</PackageReference>
179178
<PackageReference Include="ImageGlass.Tools" Version="1.9200.1" />
180-
<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.13.61">
179+
<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.14.15">
181180
<PrivateAssets>all</PrivateAssets>
182181
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
183182
</PackageReference>

‎Source/ImageGlass/Program.cs‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,11 @@ static void Main()
132132

133133

134134
// get foreground shell
135-
using var shell = new EggShell();
136-
ForegroundShell = shell.GetForegroundWindowView();
135+
if (Config.ShouldUseExplorerSortOrder)
136+
{
137+
using var shell = new EggShell();
138+
ForegroundShell = shell.GetForegroundWindowView();
139+
}
137140

138141
// check and run Quick setup
139142
if (CheckAndRunQuickSetup()) return;
@@ -332,9 +335,11 @@ private static void ActivateWindow(string[] args)
332335

333336

334337
// get foreground shell
335-
using var shell = new EggShell();
336-
ForegroundShell = shell.GetForegroundWindowView();
337-
338+
if (Config.ShouldUseExplorerSortOrder)
339+
{
340+
using var shell = new EggShell();
341+
ForegroundShell = shell.GetForegroundWindowView();
342+
}
338343

339344
// load image file from arg
340345
Local.FrmMain.LoadImagesFromCmdArgs(args);

‎Source/igcmd/igcmd.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<AssemblyTitle>Igcmd: Command-line utility for ImageGlass</AssemblyTitle>
1212
<Copyright>Copyright © 2010 - 2025 Duong Dieu Phap</Copyright>
1313
<Company>Duong Dieu Phap</Company>
14-
<Version>9.3.0.514</Version>
14+
<Version>9.3.1.518</Version>
1515
<FileVersion>$(Version)</FileVersion>
1616

1717
<EntryPointExe>$(AssemblyName).exe</EntryPointExe>

0 commit comments

Comments
 (0)