kamp/Mk0.Software.ImageSorter
1
0
Fork 0
Code Issues 1 Pull Requests Releases Activity

fixing auto zooming

Browse Source
This commit is contained in:
Manuel Kamper 2024-08-18 16:46:13 +02:00
parent dd2239531d
commit 2aaa004696
2 changed files with 86 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

153
Mk0.Software.ImageSorter/App.config
View File

@ -1,81 +1,82 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<configSections>
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<section name="Mk0.Software.ImageSorter.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
</sectionGroup>
</configSections>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
</startup>
<userSettings>
<Mk0.Software.ImageSorter.Properties.Settings>
<setting name="targetPath" serializeAs="String">
<value />
</setting>
<setting name="lastPath" serializeAs="String">
<value />
</setting>
<setting name="singleInstance" serializeAs="String">
<value>True</value>
</setting>
<setting name="lastWidth" serializeAs="String">
<value>0</value>
</setting>
<setting name="lastHeight" serializeAs="String">
<value>0</value>
</setting>
<setting name="lastTop" serializeAs="String">
<value>0</value>
</setting>
<setting name="lastLeft" serializeAs="String">
<value>0</value>
</setting>
<setting name="fileAssociation" serializeAs="String">
<value>False</value>
</setting>
<setting name="zoom" serializeAs="String">
<value>0</value>
</setting>
<setting name="showInfo" serializeAs="String">
<value>True</value>
</setting>
<setting name="fading" serializeAs="String">
<value>True</value>
</setting>
<setting name="fadingSpeed" serializeAs="String">
<value>3</value>
</setting>
<setting name="fullScreen" serializeAs="String">
<value>False</value>
</setting>
<setting name="lightBackgroundColour" serializeAs="String">
<value>Control</value>
</setting>
<setting name="darkBackgroundColour" serializeAs="String">
<value>Black</value>
</setting>
<setting name="preview" serializeAs="String">
<value>False</value>
</setting>
<setting name="inpaintUrl" serializeAs="String">
<value />
</setting>
<setting name="lastWidthInpaint" serializeAs="String">
<value>0</value>
</setting>
<setting name="lastHeightInpaint" serializeAs="String">
<value>0</value>
</setting>
<setting name="lastTopInpaint" serializeAs="String">
<value>0</value>
</setting>
<setting name="lastLeftInpaint" serializeAs="String">
<value>0</value>
</setting>
</Mk0.Software.ImageSorter.Properties.Settings>
</userSettings>
<configSections>
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<section name="Mk0.Software.ImageSorter.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
</sectionGroup>
</configSections>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
</startup>
<userSettings>
<Mk0.Software.ImageSorter.Properties.Settings>
<setting name="targetPath" serializeAs="String">
<value />
</setting>
<setting name="lastPath" serializeAs="String">
<value />
</setting>
<setting name="singleInstance" serializeAs="String">
<value>True</value>
</setting>
<setting name="lastWidth" serializeAs="String">
<value>0</value>
</setting>
<setting name="lastHeight" serializeAs="String">
<value>0</value>
</setting>
<setting name="lastTop" serializeAs="String">
<value>0</value>
</setting>
<setting name="lastLeft" serializeAs="String">
<value>0</value>
</setting>
<setting name="fileAssociation" serializeAs="String">
<value>False</value>
</setting>
<setting name="zoom" serializeAs="String">
<value>0</value>
</setting>
<setting name="showInfo" serializeAs="String">
<value>True</value>
</setting>
<setting name="fading" serializeAs="String">
<value>True</value>
</setting>
<setting name="fadingSpeed" serializeAs="String">
<value>3</value>
</setting>
<setting name="fullScreen" serializeAs="String">
<value>False</value>
</setting>
<setting name="lightBackgroundColour" serializeAs="String">
<value>Control</value>
</setting>
<setting name="darkBackgroundColour" serializeAs="String">
<value>Black</value>
</setting>
<setting name="preview" serializeAs="String">
<value>False</value>
</setting>
<setting name="inpaintUrl" serializeAs="String">
<value />
</setting>
<setting name="lastWidthInpaint" serializeAs="String">
<value>0</value>
</setting>
<setting name="lastHeightInpaint" serializeAs="String">
<value>0</value>
</setting>
<setting name="lastTopInpaint" serializeAs="String">
<value>0</value>
</setting>
<setting name="lastLeftInpaint" serializeAs="String">
<value>0</value>
</setting>
</Mk0.Software.ImageSorter.Properties.Settings>
</userSettings>
<System.Windows.Forms.ApplicationConfigurationSection>
<add key="DpiAwareness" value="SystemDPIAware"/>
<add key="DpiAwareness" value="PerMonitorV2" />
<add key="EnableWindowsFormsHighDpiAutoResizing" value="false" />
</System.Windows.Forms.ApplicationConfigurationSection>
</configuration>

15
Mk0.Software.ImageSorter/Main.cs
View File

@ -49,9 +49,11 @@ namespace Mk0.Software.ImageSorter
private FormWindowState lastState = FormWindowState.Minimized;
private string defaultWindowName;
private bool blockZoom = false;
private float scaling;
public Main()
{
scaling = (float)DeviceDpi / 96;
blockZoom = true;
InitializeComponent();
defaultWindowName = Text;
@ -754,13 +756,12 @@ namespace Mk0.Software.ImageSorter
{
imageIndex = 0;
}
pictureBoxImage.ImageLocation = CropImageBorders(images.ElementAt(imageIndex));
//blockZoom = true;
pictureBoxImage.LoadAsync(CropImageBorders(images.ElementAt(imageIndex)));
string resolutionTitle = "";
//if(pictureBoxImage.Image != null)
//{
// resolutionTitle = " (" + pictureBoxImage.Image.Width + "px x " + pictureBoxImage.Image.Height + "px)";
//}
Text = defaultWindowName + " - " + Path.GetFileName(pictureBoxImage.ImageLocation) + resolutionTitle;
//Zoom();
//Zoom();
}
else
{
@ -1125,6 +1126,8 @@ namespace Mk0.Software.ImageSorter
if (pictureBoxImage.Image.Width > panelImageBackground.Width || pictureBoxImage.Image.Height > panelImageBackground.Height)
{
pictureBoxImage.Size = new Size(panelImageBackground.Width, panelImageBackground.Height);
if (pictureBoxImage.Width != panelImageBackground.Width) { pictureBoxImage.Width = panelImageBackground.Width; }
if (pictureBoxImage.Height != panelImageBackground.Height) { pictureBoxImage.Height = panelImageBackground.Height; }
pictureBoxImage.Top = 0;
pictureBoxImage.Left = 0;
moveable = false;
@ -1297,7 +1300,7 @@ namespace Mk0.Software.ImageSorter
/// <param name="e"></param>
private void PictureBox_LoadCompleted(object sender, AsyncCompletedEventArgs e)
{
var x = comboBoxZoom.SelectedItem;
//if (blockZoom) { blockZoom = false; } else { Zoom(); }
Zoom();
}