fixing auto zooming
This commit is contained in:
parent
dd2239531d
commit
2aaa004696
@ -1,81 +1,82 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<configuration>
|
<configuration>
|
||||||
<configSections>
|
<configSections>
|
||||||
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
<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"/>
|
<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>
|
</sectionGroup>
|
||||||
</configSections>
|
</configSections>
|
||||||
<startup>
|
<startup>
|
||||||
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
|
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
|
||||||
</startup>
|
</startup>
|
||||||
<userSettings>
|
<userSettings>
|
||||||
<Mk0.Software.ImageSorter.Properties.Settings>
|
<Mk0.Software.ImageSorter.Properties.Settings>
|
||||||
<setting name="targetPath" serializeAs="String">
|
<setting name="targetPath" serializeAs="String">
|
||||||
<value />
|
<value />
|
||||||
</setting>
|
</setting>
|
||||||
<setting name="lastPath" serializeAs="String">
|
<setting name="lastPath" serializeAs="String">
|
||||||
<value />
|
<value />
|
||||||
</setting>
|
</setting>
|
||||||
<setting name="singleInstance" serializeAs="String">
|
<setting name="singleInstance" serializeAs="String">
|
||||||
<value>True</value>
|
<value>True</value>
|
||||||
</setting>
|
</setting>
|
||||||
<setting name="lastWidth" serializeAs="String">
|
<setting name="lastWidth" serializeAs="String">
|
||||||
<value>0</value>
|
<value>0</value>
|
||||||
</setting>
|
</setting>
|
||||||
<setting name="lastHeight" serializeAs="String">
|
<setting name="lastHeight" serializeAs="String">
|
||||||
<value>0</value>
|
<value>0</value>
|
||||||
</setting>
|
</setting>
|
||||||
<setting name="lastTop" serializeAs="String">
|
<setting name="lastTop" serializeAs="String">
|
||||||
<value>0</value>
|
<value>0</value>
|
||||||
</setting>
|
</setting>
|
||||||
<setting name="lastLeft" serializeAs="String">
|
<setting name="lastLeft" serializeAs="String">
|
||||||
<value>0</value>
|
<value>0</value>
|
||||||
</setting>
|
</setting>
|
||||||
<setting name="fileAssociation" serializeAs="String">
|
<setting name="fileAssociation" serializeAs="String">
|
||||||
<value>False</value>
|
<value>False</value>
|
||||||
</setting>
|
</setting>
|
||||||
<setting name="zoom" serializeAs="String">
|
<setting name="zoom" serializeAs="String">
|
||||||
<value>0</value>
|
<value>0</value>
|
||||||
</setting>
|
</setting>
|
||||||
<setting name="showInfo" serializeAs="String">
|
<setting name="showInfo" serializeAs="String">
|
||||||
<value>True</value>
|
<value>True</value>
|
||||||
</setting>
|
</setting>
|
||||||
<setting name="fading" serializeAs="String">
|
<setting name="fading" serializeAs="String">
|
||||||
<value>True</value>
|
<value>True</value>
|
||||||
</setting>
|
</setting>
|
||||||
<setting name="fadingSpeed" serializeAs="String">
|
<setting name="fadingSpeed" serializeAs="String">
|
||||||
<value>3</value>
|
<value>3</value>
|
||||||
</setting>
|
</setting>
|
||||||
<setting name="fullScreen" serializeAs="String">
|
<setting name="fullScreen" serializeAs="String">
|
||||||
<value>False</value>
|
<value>False</value>
|
||||||
</setting>
|
</setting>
|
||||||
<setting name="lightBackgroundColour" serializeAs="String">
|
<setting name="lightBackgroundColour" serializeAs="String">
|
||||||
<value>Control</value>
|
<value>Control</value>
|
||||||
</setting>
|
</setting>
|
||||||
<setting name="darkBackgroundColour" serializeAs="String">
|
<setting name="darkBackgroundColour" serializeAs="String">
|
||||||
<value>Black</value>
|
<value>Black</value>
|
||||||
</setting>
|
</setting>
|
||||||
<setting name="preview" serializeAs="String">
|
<setting name="preview" serializeAs="String">
|
||||||
<value>False</value>
|
<value>False</value>
|
||||||
</setting>
|
</setting>
|
||||||
<setting name="inpaintUrl" serializeAs="String">
|
<setting name="inpaintUrl" serializeAs="String">
|
||||||
<value />
|
<value />
|
||||||
</setting>
|
</setting>
|
||||||
<setting name="lastWidthInpaint" serializeAs="String">
|
<setting name="lastWidthInpaint" serializeAs="String">
|
||||||
<value>0</value>
|
<value>0</value>
|
||||||
</setting>
|
</setting>
|
||||||
<setting name="lastHeightInpaint" serializeAs="String">
|
<setting name="lastHeightInpaint" serializeAs="String">
|
||||||
<value>0</value>
|
<value>0</value>
|
||||||
</setting>
|
</setting>
|
||||||
<setting name="lastTopInpaint" serializeAs="String">
|
<setting name="lastTopInpaint" serializeAs="String">
|
||||||
<value>0</value>
|
<value>0</value>
|
||||||
</setting>
|
</setting>
|
||||||
<setting name="lastLeftInpaint" serializeAs="String">
|
<setting name="lastLeftInpaint" serializeAs="String">
|
||||||
<value>0</value>
|
<value>0</value>
|
||||||
</setting>
|
</setting>
|
||||||
</Mk0.Software.ImageSorter.Properties.Settings>
|
</Mk0.Software.ImageSorter.Properties.Settings>
|
||||||
</userSettings>
|
</userSettings>
|
||||||
<System.Windows.Forms.ApplicationConfigurationSection>
|
<System.Windows.Forms.ApplicationConfigurationSection>
|
||||||
<add key="DpiAwareness" value="SystemDPIAware"/>
|
<add key="DpiAwareness" value="PerMonitorV2" />
|
||||||
|
<add key="EnableWindowsFormsHighDpiAutoResizing" value="false" />
|
||||||
</System.Windows.Forms.ApplicationConfigurationSection>
|
</System.Windows.Forms.ApplicationConfigurationSection>
|
||||||
</configuration>
|
</configuration>
|
||||||
|
@ -49,9 +49,11 @@ namespace Mk0.Software.ImageSorter
|
|||||||
private FormWindowState lastState = FormWindowState.Minimized;
|
private FormWindowState lastState = FormWindowState.Minimized;
|
||||||
private string defaultWindowName;
|
private string defaultWindowName;
|
||||||
private bool blockZoom = false;
|
private bool blockZoom = false;
|
||||||
|
private float scaling;
|
||||||
|
|
||||||
public Main()
|
public Main()
|
||||||
{
|
{
|
||||||
|
scaling = (float)DeviceDpi / 96;
|
||||||
blockZoom = true;
|
blockZoom = true;
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
defaultWindowName = Text;
|
defaultWindowName = Text;
|
||||||
@ -754,13 +756,12 @@ namespace Mk0.Software.ImageSorter
|
|||||||
{
|
{
|
||||||
imageIndex = 0;
|
imageIndex = 0;
|
||||||
}
|
}
|
||||||
pictureBoxImage.ImageLocation = CropImageBorders(images.ElementAt(imageIndex));
|
//blockZoom = true;
|
||||||
|
pictureBoxImage.LoadAsync(CropImageBorders(images.ElementAt(imageIndex)));
|
||||||
string resolutionTitle = "";
|
string resolutionTitle = "";
|
||||||
//if(pictureBoxImage.Image != null)
|
|
||||||
//{
|
|
||||||
// resolutionTitle = " (" + pictureBoxImage.Image.Width + "px x " + pictureBoxImage.Image.Height + "px)";
|
|
||||||
//}
|
|
||||||
Text = defaultWindowName + " - " + Path.GetFileName(pictureBoxImage.ImageLocation) + resolutionTitle;
|
Text = defaultWindowName + " - " + Path.GetFileName(pictureBoxImage.ImageLocation) + resolutionTitle;
|
||||||
|
//Zoom();
|
||||||
|
//Zoom();
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@ -1125,6 +1126,8 @@ namespace Mk0.Software.ImageSorter
|
|||||||
if (pictureBoxImage.Image.Width > panelImageBackground.Width || pictureBoxImage.Image.Height > panelImageBackground.Height)
|
if (pictureBoxImage.Image.Width > panelImageBackground.Width || pictureBoxImage.Image.Height > panelImageBackground.Height)
|
||||||
{
|
{
|
||||||
pictureBoxImage.Size = new Size(panelImageBackground.Width, 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.Top = 0;
|
||||||
pictureBoxImage.Left = 0;
|
pictureBoxImage.Left = 0;
|
||||||
moveable = false;
|
moveable = false;
|
||||||
@ -1297,7 +1300,7 @@ namespace Mk0.Software.ImageSorter
|
|||||||
/// <param name="e"></param>
|
/// <param name="e"></param>
|
||||||
private void PictureBox_LoadCompleted(object sender, AsyncCompletedEventArgs e)
|
private void PictureBox_LoadCompleted(object sender, AsyncCompletedEventArgs e)
|
||||||
{
|
{
|
||||||
var x = comboBoxZoom.SelectedItem;
|
//if (blockZoom) { blockZoom = false; } else { Zoom(); }
|
||||||
Zoom();
|
Zoom();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user