7.8 checkin

Author: GeorgRottensteiner

.gitignore

@@ -374,3 +374,4 @@
 /Sample Projects/MacroTest/golomakdollar0.prg
 /Sample Projects/MacroTest/datawithblanks.prg
 /Sample Projects/MacroTest/specialchar.d64
+/Sample Projects/MacroTest/myresult.d64

C64Models/Version/StudioVersion.cs

@@ -2,6 +2,6 @@ namespace RetroDevStudio
 {
   public static class Version
   {
-    public const string       VersionBase = "7.7";
+    public const string       VersionBase = "7.8";
   }
 }

C64Studio/Controls/DecentForms/ControlRenderer.cs

@@ -784,16 +784,16 @@ internal void RenderTreeView()
 
     private void DrawImage( System.Drawing.Image Image, Rectangle ImageRect )
     {
-      _G.DrawImage( Image, ImageRect.X, ImageRect.Y, Image.Width, Image.Height );
+      _G.DrawImage( Image, ImageRect.X - _DisplayOffsetX, ImageRect.Y - _DisplayOffsetY, Image.Width, Image.Height );
     }
 
 
 
     private void DrawImageCentered( System.Drawing.Image Image, Rectangle ImageRect, int DX = 0, int DY = 0 )
     {
       _G.DrawImage( Image, 
-                    ImageRect.X + ( ImageRect.Width - Image.Width ) / 2 + DX,
-                    ImageRect.Y + ( ImageRect.Height - Image.Height ) / 2 + DY,
+                    ImageRect.X + ( ImageRect.Width - Image.Width ) / 2 + DX - _DisplayOffsetX,
+                    ImageRect.Y + ( ImageRect.Height - Image.Height ) / 2 + DY - _DisplayOffsetY,
                     Image.Width, Image.Height );
     }
 
@@ -1099,7 +1099,7 @@ public void RenderTreeView()
           {
             imageIndex = 0;
           }
-          DrawImage( treeView.ImageList.Images[imageIndex], imageRect );
+          DrawImageCentered( treeView.ImageList.Images[imageIndex], imageRect );
         }
 
 

C64Studio/Controls/DecentForms/TreeView.cs

@@ -1,4 +1,5 @@
-using System;
+using GR.Image;
+using System;
 using System.ComponentModel;
 using System.Drawing;
 using System.Linq;
@@ -60,6 +61,8 @@ public TreeView()
       Controls.Add( _ScrollBarH );
       _ScrollBar.Scroll += _ScrollBar_Scroll;
       _ScrollBarH.Scroll += _ScrollBarH_Scroll;
+
+      ItemHeight = (int)( ItemHeight * DPIHandler.DPIY / 96.0f + 0.5f );
       UpdateScrollbarState();
     }
 

C64Studio/Dialogs/FormCommitChanges.cs

@@ -99,6 +99,11 @@ public FormCommitChanges( StudioCore Core, Project Project, ProjectElement Eleme
         {
           item.ImageIndex = (int)element.DocumentInfo.Type;
         }
+        else
+        {
+          // binary for non project files
+          item.ImageIndex = 12;
+        }
 
         if ( state.Filename == _Element.Filename )
         {

C64Studio/Documents/GraphicScreenEditor.Designer.cs

@@ -387,8 +387,8 @@ private void HandleMouseOnEditor( int X, int Y, MouseButtons Buttons )
                   --actDY;
                 }
                 m_DragPoint.Offset( -tempDX * requiredDelta, -tempDY * requiredDelta );
-                screenHScroll_Scroll( screenHScroll, new ScrollEventArgs( ScrollEventType.ThumbPosition, screenHScroll.Value ) );
-                screenVScroll_Scroll( screenVScroll, new ScrollEventArgs( ScrollEventType.ThumbPosition, screenVScroll.Value ) );
+                screenHScroll_Scroll( screenHScroll );
+                screenVScroll_Scroll( screenVScroll );
               }
             }
           }
@@ -2878,25 +2878,22 @@ private void AdjustScrollbars()
 
 
 
-    private void screenHScroll_Scroll( object sender, ScrollEventArgs e )
+    private void screenHScroll_Scroll( DecentForms.ControlBase Sender )
     {
-      if ( m_GraphicScreenProject.ScreenOffsetX != e.NewValue )
+      if ( m_GraphicScreenProject.ScreenOffsetX != screenHScroll.Value )
       {
-        m_GraphicScreenProject.ScreenOffsetX = e.NewValue;
-
-        Debug.Log( $"Scrollx {e.NewValue}" );
+        m_GraphicScreenProject.ScreenOffsetX = screenHScroll.Value;
         Redraw();
       }
     }
 
 
 
-    private void screenVScroll_Scroll( object sender, ScrollEventArgs e )
+    private void screenVScroll_Scroll( DecentForms.ControlBase Sender )
     {
-      if ( m_GraphicScreenProject.ScreenOffsetY != e.NewValue )
+      if ( m_GraphicScreenProject.ScreenOffsetY != screenVScroll.Value )
       {
-        m_GraphicScreenProject.ScreenOffsetY = e.NewValue;
-        Debug.Log( $"Scrolly {e.NewValue}" );
+        m_GraphicScreenProject.ScreenOffsetY = screenVScroll.Value;
         Redraw();
       }
     }
@@ -4017,7 +4014,7 @@ private void btnZoomIn_Click( DecentForms.ControlBase Sender )
         oldValueH = Math.Max( 0, oldValueH );
         oldValueH = Math.Min( screenHScroll.Maximum, oldValueH );
         screenHScroll.Value = oldValueH;
-        screenHScroll_Scroll( this, new ScrollEventArgs( ScrollEventType.ThumbPosition, oldValueH ) );
+        screenHScroll_Scroll( screenHScroll );
 
         //screenVScroll.Value += centerY * m_ZoomFactor;
 

C64Studio/Documents/GraphicScreenEditor.cs

@@ -450,7 +450,7 @@ void pictureEditor_MouseWheel( object sender, MouseEventArgs e )
         if ( oldValue != newValue )
         {
           mapVScroll.Value = newValue;
-          mapVScroll_Scroll( null, new ScrollEventArgs( ScrollEventType.ThumbPosition, oldValue, newValue ) );
+          mapVScroll_Scroll( mapVScroll );
         }
       }
     }
@@ -2298,23 +2298,23 @@ private void btnMapApply_Click( DecentForms.ControlBase Sender )
 
 
 
-    private void mapHScroll_Scroll( object sender, ScrollEventArgs e )
+    private void mapHScroll_Scroll( DecentForms.ControlBase Sender )
     {
-      if ( m_CurEditorOffsetX != e.NewValue )
+      if ( m_CurEditorOffsetX != mapHScroll.Value )
       {
-        m_CurEditorOffsetX = e.NewValue;
+        m_CurEditorOffsetX = mapHScroll.Value;
         RedrawMap();
         Redraw();
       }
     }
 
 
 
-    private void mapVScroll_Scroll( object sender, ScrollEventArgs e )
+    private void mapVScroll_Scroll( DecentForms.ControlBase Sender )
     {
-      if ( m_CurEditorOffsetY != e.NewValue )
+      if ( m_CurEditorOffsetY != mapVScroll.Value )
       {
-        m_CurEditorOffsetY = e.NewValue;
+        m_CurEditorOffsetY = mapVScroll.Value;
         RedrawMap();
         Redraw();
       }

C64Studio/Documents/MapEditor.Designer.cs

@@ -23,7 +23,7 @@ public class StudioCore
     public Notification       Notification;
     public Tasks.TaskManager  TaskManager;
     public bool               ShuttingDown = false;
-    public const string       StudioVersion = Version.VersionBase + "b";
+    public const string       StudioVersion = Version.VersionBase;
     public StudioTheme        Theming;
 
     public static StudioCore  StaticCore = null;