diff --git a/Mk0.Software.ImageSorter/App.config b/Mk0.Software.ImageSorter/App.config
index 789af55..e5198af 100644
--- a/Mk0.Software.ImageSorter/App.config
+++ b/Mk0.Software.ImageSorter/App.config
@@ -1,81 +1,82 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- True
-
-
- 0
-
-
- 0
-
-
- 0
-
-
- 0
-
-
- False
-
-
- 0
-
-
- True
-
-
- True
-
-
- 3
-
-
- False
-
-
- Control
-
-
- Black
-
-
- False
-
-
-
-
-
- 0
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ True
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ False
+
+
+ 0
+
+
+ True
+
+
+ True
+
+
+ 3
+
+
+ False
+
+
+ Control
+
+
+ Black
+
+
+ False
+
+
+
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+
-
+
+
diff --git a/Mk0.Software.ImageSorter/Main.cs b/Mk0.Software.ImageSorter/Main.cs
index 52442fd..c815989 100644
--- a/Mk0.Software.ImageSorter/Main.cs
+++ b/Mk0.Software.ImageSorter/Main.cs
@@ -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
///
private void PictureBox_LoadCompleted(object sender, AsyncCompletedEventArgs e)
{
- var x = comboBoxZoom.SelectedItem;
+ //if (blockZoom) { blockZoom = false; } else { Zoom(); }
Zoom();
}