Fix update preview

Add missing supported image formats from ope file dialog Fix preview image dimension Fix preview image set to null after image opening
ptrsuder · Sep 7, 2019 · dc0857b · dc0857b
1 parent dfc6ab6
commit dc0857b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 13 deletions.
diff --git a/MainForm.cs b/MainForm.cs
@@ -550,6 +550,9 @@ private void UpdateStatusBar()
 
         private void OpenImage(string fullname)
         {
+            originalPreview = null;
+            resultPreview = null;
+
             Image image = Helper.LoadImageToBitmap(fullname);
             previewFullname = fullname;
             //zoomImageBox.BeginUpdate();
@@ -575,9 +578,7 @@ private void OpenImage(string fullname)
             FillZoomLevels();
             UpdateStatusBar();
             zoomImageBox.ZoomToFit();
-
-            originalPreview = null;
-            resultPreview = null;
+
         }
 
         private void UpdatePreview()
@@ -599,9 +600,9 @@ private void UpdatePreview()
 
             Size viewSize = zoomImageBox.GetInsideViewPort().Size;
 
-            if (scaledWidth < viewSize.Width)
+            if (scaledWidth <= viewSize.Width)
                 wOffset = 0;
-            if (scaledHeight < viewSize.Height)
+            if (scaledHeight <= viewSize.Height)
                 hOffset = 0;
 
             w += wOffset;
@@ -823,7 +824,7 @@ private void openFromFileToolStripMenuItem_Click(object sender, EventArgs e)
         {
             using (FileDialog dialog = new OpenFileDialog())
             {
-                dialog.Filter = "All Supported Images (*.bmp;*.dib;*.rle;*.gif;*.jpg;*.jpeg;*.png)|*.bmp;*.dib;*.rle;*.gif;*.jpg;*.jpeg;*.png|Bitmaps (*.bmp;*.dib;*.rle)|*.bmp;*.dib;*.rle|Graphics Interchange Format (*.gif)|*.gif|Joint Photographic Experts (*.jpg)|*.jpg|Portable Network Graphics (*.png)|*.png|All Files (*.*)|*.*";
+                dialog.Filter = "All Supported Images (*.bmp;*.dib;*.rle;*.gif;*.jpg;*.jpeg;*.png;*.dds;*.tga;*.tiff;*.webp)|*.bmp;*.dib;*.rle;*.gif;*.jpg;*.jpeg;*.png;*.dds;*.tga;*.tiff;*.webp|All Files (*.*)|*.*";
                 dialog.DefaultExt = "png";
 
                 if (dialog.ShowDialog(this) == DialogResult.OK)
@@ -884,7 +885,7 @@ private async void previewUpdate_button_Click(object sender, EventArgs e)
             }
             else
             {
-                MessageBox.Show($"Failed to create preview! Logs saved in <{ViewModel.previeIEU.EsrganPath}>");
+                MessageBox.Show($"Failed to create preview! Logs saved in <{ViewModel.EsrganPath}\\IEU_preview>");
             }
         }
 

diff --git a/MainForm.resx b/MainForm.resx
@@ -123,9 +123,6 @@
   <metadata name="toolStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>224, 17</value>
   </metadata>
-  <metadata name="toolStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>224, 17</value>
-  </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="openFromFileToolStripButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -187,9 +184,6 @@
   <metadata name="treeView_contextMenuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>114, 17</value>
   </metadata>
-  <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAABAAgAGBgAAAEAIACICQAAhgAAACAgAAABACAAqBAAAA4KAAAwMAAAAQAgAKglAAC2GgAAQEAAAAEA