Merge branch 'dev' - v2.5

Changes:

Functionality:
- Middle mouse - drag the canvas
- Straight line painting (hold Shift / Ctrl)
- A button to Copy from Test font dialog to then paste into another frame

Bugs fixed:
- Nothing selected after removing a symbol. Potential error throw on "Apply"

McBitFont/ChangeHistory.cs

@@ -61,7 +61,7 @@ namespace McBitFont {
             public FrameMiniature? Canvas { get; set; } = canvas;
         }
 
-        private static FrameMiniature CopyFrameSimple(FrameMiniature f) {
+        public static FrameMiniature CopyFrameSimple(FrameMiniature f) {
             FrameMiniature newf = new(f.code, f.width, f.height);
             Array.Copy(f.data, newf.data, f.data.Length);
             return newf;

McBitFont/FontTester.Designer.cs

@@ -34,6 +34,7 @@
             lblZoom = new System.Windows.Forms.Label();
             cbZoom = new System.Windows.Forms.ComboBox();
             toolTip1 = new System.Windows.Forms.ToolTip(components);
+            btnCopy = new System.Windows.Forms.Button();
             chkBaseline = new System.Windows.Forms.CheckBox();
             ((System.ComponentModel.ISupportInitialize)nudSpace).BeginInit();
             SuspendLayout();
@@ -98,7 +99,7 @@
             vScroll.LargeChange = 25;
             vScroll.Location = new System.Drawing.Point(251, 84);
             vScroll.Name = "vScroll";
-            vScroll.Size = new System.Drawing.Size(21, 125);
+            vScroll.Size = new System.Drawing.Size(21, 104);
             vScroll.TabIndex = 17;
             vScroll.ValueChanged += Scrolling;
             // 
@@ -140,6 +141,21 @@
             toolTip1.InitialDelay = 500;
             toolTip1.ReshowDelay = 100;
             // 
+            // btnCopy
+            // 
+            btnCopy.Anchor = System.Windows.Forms.AnchorStyles.Bottom;
+            btnCopy.Image = Properties.Resources.Famfamfam_Silk_Page_copy_16;
+            btnCopy.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
+            btnCopy.Location = new System.Drawing.Point(110, 214);
+            btnCopy.Name = "btnCopy";
+            btnCopy.Size = new System.Drawing.Size(80, 30);
+            btnCopy.TabIndex = 21;
+            btnCopy.Text = " Copy";
+            btnCopy.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText;
+            toolTip1.SetToolTip(btnCopy, "Copy BitPixels you see to Clipboard");
+            btnCopy.UseVisualStyleBackColor = true;
+            btnCopy.MouseClick += Copy_Click;
+            // 
             // chkBaseline
             // 
             chkBaseline.AutoSize = true;
@@ -155,7 +171,8 @@
             // 
             AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
             AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            ClientSize = new System.Drawing.Size(284, 221);
+            ClientSize = new System.Drawing.Size(284, 251);
+            Controls.Add(btnCopy);
             Controls.Add(chkBaseline);
             Controls.Add(cbZoom);
             Controls.Add(lblZoom);
@@ -168,13 +185,14 @@
             Controls.Add(lblSpace);
             MaximizeBox = false;
             MinimizeBox = false;
-            MinimumSize = new System.Drawing.Size(260, 260);
+            MinimumSize = new System.Drawing.Size(300, 290);
             Name = "FontTester";
             ShowIcon = false;
             ShowInTaskbar = false;
             StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
             Text = "Font Tester";
             Load += FontTester_Load;
+            Resize += Form_Resize;
             ((System.ComponentModel.ISupportInitialize)nudSpace).EndInit();
             ResumeLayout(false);
             PerformLayout();
@@ -193,5 +211,6 @@
         private System.Windows.Forms.ToolTip toolTip1;
         private System.Windows.Forms.ComboBox cbZoom;
         private System.Windows.Forms.CheckBox chkBaseline;
+        private System.Windows.Forms.Button btnCopy;
     }
 }

McBitFont/FontTester.cs

@@ -1,4 +1,5 @@
-using System;
+using MessagePack;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Data;
@@ -24,6 +25,8 @@ namespace McBitFont {
         private int cellSize;
         private int width;
 
+        private readonly DataFormats.Format clpbFormat = DataFormats.GetFormat("McBitFontFrame");
+
         public FontTester(int codepage, int height, int baseline, List<MainForm.FrameMiniature> frames) {
             InitializeComponent();
             Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
@@ -53,7 +56,7 @@ namespace McBitFont {
             int space = (int)nudSpace.Value;
             int index = 0;
             for (int c = 0; c < encoded.Length; c++) {
-                // Check if we have suck symbol
+                // Check if we have such symbol
                 var f = frames.FindAll(x => x.code == encoded[c]);
                 if (f.Count == 1) {
                     // Draw the symbol
@@ -160,6 +163,42 @@ namespace McBitFont {
         private void Scrolling(object sender, EventArgs e) {
             dotPanel.Invalidate();
         }
+
+        private void Form_Resize(object sender, EventArgs e) {
+            btnCopy.Left = this.Width / 2 - 40;
+        }
+
+        private void Copy_Click(object sender, MouseEventArgs e) {
+            if (encoded.Length < 1) {
+                MessageBox.Show("Nothing to copy! Type some symbols first.", "Error!", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
+            // Sycle through ecoded bytes of test text
+            int space = (int)nudSpace.Value;
+            int index = 0;
+            int i, j;
+            MainForm.FrameMiniature ff = new(0, width, frames[0].height);
+            for (int c = 0; c < encoded.Length; c++) {
+                // Check if we have such symbol
+                var f = frames.FindAll(x => x.code == encoded[c]);
+                if (f.Count == 1) {
+                    // Draw the symbol
+                    for (i = 0; i < f[0].width; i++) {
+                        for (j = 0; j < f[0].height; j++) {
+                            // Fill the frame with data
+                            ff.data[index + i, j] = f[0].data[i, j];
+                        }
+                    }
+                    index += (f[0].width > 0 ? f[0].width + space : 0);
+                } else {
+                    index += 5 + space;
+                }
+            }
+            // Copy the frame we made into Clipboard
+            var bb = MessagePackSerializer.Serialize(ChangeHistory.CopyFrameSimple(ff));
+            DataObject clpbObj = new DataObject(clpbFormat.Name, bb);
+            Clipboard.SetDataObject(clpbObj, true);
+        }
     }
 
 

McBitFont/Form1.Designer.cs

@@ -493,7 +493,10 @@
             // hScroll
             // 
             hScroll.Anchor = System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right;
+            hScroll.Enabled = false;
+            hScroll.LargeChange = 2;
             hScroll.Location = new System.Drawing.Point(14, 609);
+            hScroll.Maximum = 1;
             hScroll.Name = "hScroll";
             hScroll.Size = new System.Drawing.Size(427, 21);
             hScroll.TabIndex = 14;
@@ -502,8 +505,10 @@
             // vScroll
             // 
             vScroll.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right;
-            vScroll.LargeChange = 25;
+            vScroll.Enabled = false;
+            vScroll.LargeChange = 2;
             vScroll.Location = new System.Drawing.Point(444, 31);
+            vScroll.Maximum = 1;
             vScroll.Name = "vScroll";
             vScroll.Size = new System.Drawing.Size(21, 575);
             vScroll.TabIndex = 15;

McBitFont/Form1.cs

@@ -59,7 +59,7 @@ namespace McBitFont {
         public bool monospaced = false;
         private bool modified = false;
         private bool prjModified = false;
-        public const string version = "2.4";
+        public const string version = "2.5";
         public string prjName = "Untitled";
         public string prjFileName = "";
         public int codepage = 1251;
@@ -128,6 +128,8 @@ namespace McBitFont {
 
             fbuf = new FrameMiniature(0, dotWidth, dotHeight);
 
+            history = new(this);
+
             // Chek for arguments
             if (Environment.GetCommandLineArgs().Length > 1) {
                 LoadProject(Environment.GetCommandLineArgs()[1]);
@@ -140,7 +142,6 @@ namespace McBitFont {
 
             CheckForAdd();
             
-            history = new(this);
         }
 
         [DllImport("user32.dll")]
@@ -285,9 +286,6 @@ namespace McBitFont {
             }
             SetNewWH();
             cbZoom_SelectedIndexChanged(cbZoom, null);
-
-            // Re-create history object
-            //history = new CanvasHistory();
         }
 
         private void cbZoom_SelectedIndexChanged(object sender, EventArgs e) {
@@ -298,6 +296,7 @@ namespace McBitFont {
             if (w <= dotPanel.Width) {
                 hScroll.Enabled = false;
                 hScroll.Value = 0;
+                vScroll.Maximum = 0;
             } else {
                 hScroll.Maximum = w - dotPanel.Width + 12;
                 hScroll.Minimum = 0;
@@ -307,6 +306,7 @@ namespace McBitFont {
             if (h <= dotPanel.Height) {
                 vScroll.Enabled = false;
                 vScroll.Value = 0;
+                vScroll.Maximum = 0;
             } else {
                 vScroll.Maximum = h - dotPanel.Height + 12;
                 vScroll.Minimum = 0;
@@ -335,7 +335,6 @@ namespace McBitFont {
 
             (x, y, x2, y2) = RectSelCoords();
 
-            //history.AddPre(f);
             for (int i = x; i <= x2; i++) {
                 c = f.data[i, y];
                 for (int j = y; j <= y2; j++) {
@@ -346,7 +345,6 @@ namespace McBitFont {
                     }
                 }
             }
-            //history.AddPost(f);
             history.Add(f);
             CheckHistoryButtons();
             SetModified();
@@ -359,7 +357,6 @@ namespace McBitFont {
 
             (x, y, x2, y2) = RectSelCoords();
 
-            //history.AddPre(f);
             for (int i = x; i <= x2; i++) {
                 c = f.data[i, y2];
                 for (int j = y2; j >= y; j--) {
@@ -370,7 +367,6 @@ namespace McBitFont {
                     }
                 }
             }
-            //history.AddPost(f);
             history.Add(f);
             CheckHistoryButtons();
             SetModified();
@@ -383,7 +379,6 @@ namespace McBitFont {
 
             (x, y, x2, y2) = RectSelCoords();
 
-            //history.AddPre(f);
             for (int j = y; j <= y2; j++) {
                 c = f.data[x, j];
                 for (int i = x; i <= x2; i++) {
@@ -394,7 +389,6 @@ namespace McBitFont {
                     }
                 }
             }
-            //history.AddPost(f);
             history.Add(f);
             CheckHistoryButtons();
             SetModified();
@@ -406,7 +400,6 @@ namespace McBitFont {
             bool c;
             (x, y, x2, y2) = RectSelCoords();
 
-            //history.AddPre(f);
             for (int j = y; j <= y2; j++) {
                 c = f.data[x2, j];
                 for (int i = x2; i >= x; i--) {
@@ -417,19 +410,54 @@ namespace McBitFont {
                     }
                 }
             }
-            //history.AddPost(f);
             history.Add(f);
             CheckHistoryButtons();
             SetModified();
             dotPanel.Refresh();
         }
 
-        private bool mouseDown = false;
+        private bool mouseDown = false; // Used in canvas history tracking and rectangle selection logics
-        private bool fChanged = false;
+        private bool fChanged = false; // Used in canvas history (undo / redo) tracking
+        private bool mouseDownMiddle = false; // Used in middle mouse dragging logic
+        private int mouseX, mouseY; // To remember last mouse X and Y (used in middle mouse dragging logic)
+        private int lastX = 0, lastY = 0; // Used for drawing straight lines
         private void dotPanel_MouseMove(object sender, MouseEventArgs e) {
             var rectSel = chkRectSelect.Checked;
             bool rectSelUpdated = false;
 
+            // Drag with middle mouse button
+            if (vScroll.Enabled || hScroll.Enabled) {
+                if (mouseDownMiddle) {
+                    var dY = mouseY - e.Y <= -cellSize - gap || mouseY - e.Y >= cellSize + gap;
+                    var dX = mouseX - e.X <= -cellSize - gap || mouseX - e.X >= cellSize + gap;
+                    int newY = vScroll.Value;
+                    int newX = hScroll.Value;
+                    if (dX) {
+                        newX += (mouseX - e.X);
+                        if (newX < hScroll.Minimum) newX = hScroll.Minimum;
+                        if (newX > hScroll.Maximum) newX = hScroll.Maximum;
+                        mouseX = e.X;
+                        hScroll.Value = newX;
+                    }
+                    if (dY) {
+                        newY += (mouseY - e.Y);
+                        if (newY < vScroll.Minimum) newY = vScroll.Minimum;
+                        if (newY > vScroll.Maximum) newY = vScroll.Maximum;
+                        mouseY = e.Y;
+                        vScroll.Value = newY;
+                    }
+                }
+                if (!mouseDownMiddle && e.Button == MouseButtons.Middle) {
+                    mouseDownMiddle = true;
+                    mouseX = e.X;
+                    mouseY = e.Y;
+                }
+                if (mouseDownMiddle && e.Button == MouseButtons.None) {
+                    mouseDownMiddle = false;
+                }
+            }
+            
+
             // Moving baseline
             Rectangle rect1, rect2;
             if (set_base) {
@@ -485,13 +513,8 @@ namespace McBitFont {
                     NormPoints(ref selection1, ref selection2);
                     dotPanel.Invalidate();
                 } else {
-                    //if (!fChanged) {
-                    //    history.Remove(false);
-                    //} else {
                     if (fChanged) { 
                         fChanged = false;
-                        //history.ApplyAdded();
-                        //history.AddPost(f);
                         history.Add(f);
                     }
                     CheckHistoryButtons();
@@ -529,6 +552,15 @@ namespace McBitFont {
                 return;
             }
 
+            // Check for Shift / Ctrl keys for straight lines
+            if (ModifierKeys.HasFlag(Keys.Shift)) {
+                j = lastY;
+            } else if (ModifierKeys.HasFlag(Keys.Control)) {
+                i = lastX;
+            }
+            lastX = i;
+            lastY = j;
+
             // Paint black / white
             if (e.Button == MouseButtons.Left && !f.data[i, j]) {
                 f.data[i, j] = true;
@@ -554,8 +586,6 @@ namespace McBitFont {
         private void btnInvert_Click(object sender, EventArgs e) {
             int x, y, x2, y2;
 
-            //history.AddPre(f);
-
             (x, y, x2, y2) = RectSelCoords();
 
             for (int i = x; i <= x2; i++) {
@@ -564,7 +594,6 @@ namespace McBitFont {
                 }
             }
 
-            //history.AddPost(f);
             history.Add(f);
             CheckHistoryButtons();
             SetModified();
@@ -577,7 +606,6 @@ namespace McBitFont {
 
             (x, y, x2, y2) = RectSelCoords();
 
-            //history.AddPre(f);
             for (j = y; j <= y2; j++) {
                 a = x;
                 b = x2;
@@ -589,7 +617,6 @@ namespace McBitFont {
                     b--;
                 }
             }
-            //history.AddPost(f);
             history.Add(f);
             CheckHistoryButtons();
             SetModified();
@@ -602,7 +629,6 @@ namespace McBitFont {
 
             (x, y, x2, y2) = RectSelCoords();
 
-            //history.AddPre(f);
             for (i = x; i <= x2; i++) {
                 a = y;
                 b = y2;
@@ -614,7 +640,6 @@ namespace McBitFont {
                     b--;
                 }
             }
-            //history.AddPost(f);
             history.Add(f);
             CheckHistoryButtons();
             SetModified();
@@ -786,7 +811,6 @@ namespace McBitFont {
                 FrameMiniature newf;
                 if (form.cbSingle.Checked) {
                     frames.Add(new FrameMiniature(0, neww, newh));
-                    //f = frames.Find(x => x.code == 0);
                     append = "Single";
                     monospaced = false;
                 } else {
@@ -839,8 +863,6 @@ namespace McBitFont {
                 miniList.Refresh();
                 dotPanel.Refresh();
 
-                // Re-create history object
-                //history = new CanvasHistory();
                 history.Clear();
 
                 Cursor.Current = Cursors.Default;
@@ -861,8 +883,6 @@ namespace McBitFont {
                 return;
             }
             dotPanel.SuspendLayout();
-            // Clear history
-            //history.Clear();
 
             var sel = miniList.SelectedItems[0];
             int code = Convert.ToInt32(sel.ImageKey);
@@ -965,8 +985,6 @@ namespace McBitFont {
 
             CheckForAdd();
 
-            // Re-create history object
-            //history = new CanvasHistory();
             history.Clear();
 
             tsmiMakeVarWidth.Visible = monospaced;
@@ -1017,9 +1035,11 @@ namespace McBitFont {
             var sel = miniList.SelectedItems[0].ImageKey;
             int code = Convert.ToInt32(miniList.SelectedItems[0].ImageKey);
             FrameMiniature ff = frames.Find(x => x.code == code);
+            bool isLast = frames.Last().Equals(ff);
             frames.Remove(ff);
             miniList.SelectedItems[0].Remove();
-            //miniList.Items[0].Selected = true;
+
+            miniList.Items[isLast ? miniList.Items.Count - 1 : 0].Selected = true;
         }
 
         private void prependSymbolToolStripMenuItem_Click(object sender, EventArgs e) {
@@ -1080,7 +1100,6 @@ namespace McBitFont {
                 return;
             }
 
-            //history.AddPre(f);
             int di, dj, wmax, hmax, selw, selh;
             if (chkRectSelect.Checked) {
                 di = selection1.X;
@@ -1102,7 +1121,6 @@ namespace McBitFont {
                 }
             }
 
-            //history.AddPost(f);
             history.Add(f);
             CheckHistoryButtons();
             dotPanel.Refresh();
@@ -1152,8 +1170,6 @@ namespace McBitFont {
         private void FillFrame(bool val) {
             int x, y, x2, y2;
 
-            //history.AddPre(f);
-
             (x, y, x2, y2) = RectSelCoords();
 
             for (int i = x; i <= x2; i++) {
@@ -1162,7 +1178,6 @@ namespace McBitFont {
                 }
             }
 
-            //history.AddPost(f);
             history.Add(f);
             CheckHistoryButtons();
             SetModified();
@@ -1244,14 +1259,12 @@ namespace McBitFont {
         }
 
         private void undoToolStripMenuItem_Click(object sender, EventArgs e) {
-            //history.Undo(f);
             history.Undo();
             dotPanel.Refresh();
             CheckHistoryButtons();
         }
 
         private void redoToolStripMenuItem_Click(object sender, EventArgs e) {
-            //history.Redo(f);
             history.Redo();
             dotPanel.Refresh();
             CheckHistoryButtons();
@@ -1303,13 +1316,11 @@ namespace McBitFont {
         private void importImageToolStripMenuItem_Click(object sender, EventArgs e) {
             ImageImporter iform = new ImageImporter(f.width, f.height);
             if (iform.ShowDialog() == DialogResult.OK) {
-                //history.AddPre(f);
                 for (int i = 0; i < iform.bmpScaled.Width; i++) {
                     for (int j = 0; j < iform.bmpScaled.Height; j++) {
                         f.data[i, j] = iform.bmpScaled.GetPixel(i, j).ToArgb().Equals(Color.Black.ToArgb());
                     }
                 }
-                //history.AddPost(f);
                 history.Add(f);
                 CheckHistoryButtons();
                 dotPanel.Refresh();

McBitFont/McBitFont.csproj

@@ -20,9 +20,9 @@
     <UseWindowsForms>true</UseWindowsForms>
     <ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
     <ApplicationIcon>icon_64.ico</ApplicationIcon>
-    <AssemblyVersion>2.4.0.0</AssemblyVersion>
+    <AssemblyVersion>2.5.0.0</AssemblyVersion>
-    <FileVersion>2.4.0.0</FileVersion>
+    <FileVersion>2.5.0.0</FileVersion>
-    <Version>$(VersionPrefix)2.4.0</Version>
+    <Version>$(VersionPrefix)2.5.0</Version>
     <Copyright>Anton Mukhin</Copyright>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

README.md

@@ -20,6 +20,8 @@ Some basic hints on the interface:
 - Mouse 1 to mark a pixel black
 - Mouse 2 to mark a pixel white
 - Drag the mouse holding a button to draw pixels
+- Hold Shift to constrain painting horizontally
+- Hold Ctrl to constrain painting vertically
 - Mouse Scroll to scroll up and down
 - Shift + scroll to scroll left and right
 - Crtl + scroll to zoom

TODO.txt

@@ -1,11 +1,11 @@
 Application:
 - Consider migrating to WPF in order to make DPI aware UI
-V Copy-Paste now uses System clipboard and it is possible to copy-paste from/to different instances of running program
+
 
 Functionality:
-V Rewrite history class so it tracks all changes, not only a canvas changes
+V Middle mouse - drag the canvas
+V Straight line painting (hold Shift / Ctrl)
+V A button to Copy from Test font dialog to then paste into another frame
 
 Bugs:
-V In some cases after switching to a symbol dotPanel mouse move causes "Out of range" exception (history.Pre after width change?)
+V Nothing selected after removing a symbol. Potential error throw on "Apply"
-V Switching between symbols while select tool is active and small area selected trows an error
-V Full frame Copy in Clipboard does not respect selection on Paste operation