Merge branch 'fix-broken-resize'

McBitFont/Form1.Designer.cs

@@ -50,22 +50,18 @@
             this.label5 = new System.Windows.Forms.Label();
             this.menuStrip1 = new System.Windows.Forms.MenuStrip();
             this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.editToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.exportToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.aboutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.dlgSave = new System.Windows.Forms.SaveFileDialog();
-            this.dlgOpen = new System.Windows.Forms.OpenFileDialog();
             this.newToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.openToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.saveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.editToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.copyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.pasteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.prependSymbolToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.appendSymbolToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.removeSymbolToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.applyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.shiftUpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.shiftDownToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.shiftLeftToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -73,6 +69,11 @@
             this.invertToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.mirrorXToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.mirrorYToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.exportToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.aboutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.dlgSave = new System.Windows.Forms.SaveFileDialog();
+            this.dlgOpen = new System.Windows.Forms.OpenFileDialog();
+            this.btnBaseline = new System.Windows.Forms.Button();
             ((System.ComponentModel.ISupportInitialize)(this.nudX)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.nudY)).BeginInit();
             this.panel1.SuspendLayout();
@@ -122,7 +123,7 @@
             // nudY
             // 
             this.nudY.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.nudY.Location = new System.Drawing.Point(717, 53);
+            this.nudY.Location = new System.Drawing.Point(717, 49);
             this.nudY.Maximum = new decimal(new int[] {
             255,
             0,
@@ -157,7 +158,7 @@
             // 
             this.label2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(670, 55);
+            this.label2.Location = new System.Drawing.Point(670, 51);
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(41, 13);
             this.label2.TabIndex = 4;
@@ -202,7 +203,7 @@
             // 
             this.label4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.label4.AutoSize = true;
-            this.label4.Location = new System.Drawing.Point(602, 29);
+            this.label4.Location = new System.Drawing.Point(604, 29);
             this.label4.Name = "label4";
             this.label4.Size = new System.Drawing.Size(62, 13);
             this.label4.TabIndex = 7;
@@ -304,7 +305,7 @@
             // btnExport
             // 
             this.btnExport.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnExport.Location = new System.Drawing.Point(696, 99);
+            this.btnExport.Location = new System.Drawing.Point(696, 109);
             this.btnExport.Name = "btnExport";
             this.btnExport.Size = new System.Drawing.Size(75, 23);
             this.btnExport.TabIndex = 10;
@@ -343,7 +344,7 @@
             // btnApply
             // 
             this.btnApply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnApply.Location = new System.Drawing.Point(589, 99);
+            this.btnApply.Location = new System.Drawing.Point(615, 109);
             this.btnApply.Name = "btnApply";
             this.btnApply.Size = new System.Drawing.Size(75, 23);
             this.btnApply.TabIndex = 13;
@@ -376,7 +377,7 @@
             // 
             this.label5.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.label5.AutoSize = true;
-            this.label5.Location = new System.Drawing.Point(640, 71);
+            this.label5.Location = new System.Drawing.Point(554, 114);
             this.label5.Name = "label5";
             this.label5.Size = new System.Drawing.Size(24, 13);
             this.label5.TabIndex = 16;
@@ -407,60 +408,6 @@
             this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 20);
             this.fileToolStripMenuItem.Text = "File";
             // 
-            // editToolStripMenuItem
-            // 
-            this.editToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.copyToolStripMenuItem,
-            this.pasteToolStripMenuItem,
-            this.prependSymbolToolStripMenuItem,
-            this.appendSymbolToolStripMenuItem,
-            this.removeSymbolToolStripMenuItem,
-            this.applyToolStripMenuItem});
-            this.editToolStripMenuItem.Name = "editToolStripMenuItem";
-            this.editToolStripMenuItem.Size = new System.Drawing.Size(39, 20);
-            this.editToolStripMenuItem.Text = "Edit";
-            // 
-            // toolsToolStripMenuItem
-            // 
-            this.toolsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.shiftUpToolStripMenuItem,
-            this.shiftDownToolStripMenuItem,
-            this.shiftLeftToolStripMenuItem,
-            this.shiftRightToolStripMenuItem,
-            this.invertToolStripMenuItem,
-            this.mirrorXToolStripMenuItem,
-            this.mirrorYToolStripMenuItem,
-            this.exportToolStripMenuItem});
-            this.toolsToolStripMenuItem.Name = "toolsToolStripMenuItem";
-            this.toolsToolStripMenuItem.Size = new System.Drawing.Size(46, 20);
-            this.toolsToolStripMenuItem.Text = "Tools";
-            // 
-            // exportToolStripMenuItem
-            // 
-            this.exportToolStripMenuItem.Name = "exportToolStripMenuItem";
-            this.exportToolStripMenuItem.ShortcutKeyDisplayString = "Ctrl+E";
-            this.exportToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.E)));
-            this.exportToolStripMenuItem.Size = new System.Drawing.Size(197, 22);
-            this.exportToolStripMenuItem.Text = "Export";
-            this.exportToolStripMenuItem.Click += new System.EventHandler(this.button1_Click);
-            // 
-            // aboutToolStripMenuItem
-            // 
-            this.aboutToolStripMenuItem.Name = "aboutToolStripMenuItem";
-            this.aboutToolStripMenuItem.Size = new System.Drawing.Size(52, 20);
-            this.aboutToolStripMenuItem.Text = "About";
-            this.aboutToolStripMenuItem.Click += new System.EventHandler(this.aboutToolStripMenuItem_Click);
-            // 
-            // dlgSave
-            // 
-            this.dlgSave.DefaultExt = "mbf";
-            this.dlgSave.Filter = "McBitFont files|*.mbf|All files|*.*";
-            // 
-            // dlgOpen
-            // 
-            this.dlgOpen.DefaultExt = "mbf";
-            this.dlgOpen.Filter = "McBitFont files|*.mbf|All files|*.*";
-            // 
             // newToolStripMenuItem
             // 
             this.newToolStripMenuItem.Image = global::McBitFont.Properties.Resources.file;
@@ -501,6 +448,19 @@
             this.exitToolStripMenuItem.Text = "Exit";
             this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click);
             // 
+            // editToolStripMenuItem
+            // 
+            this.editToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.copyToolStripMenuItem,
+            this.pasteToolStripMenuItem,
+            this.prependSymbolToolStripMenuItem,
+            this.appendSymbolToolStripMenuItem,
+            this.removeSymbolToolStripMenuItem,
+            this.applyToolStripMenuItem});
+            this.editToolStripMenuItem.Name = "editToolStripMenuItem";
+            this.editToolStripMenuItem.Size = new System.Drawing.Size(39, 20);
+            this.editToolStripMenuItem.Text = "Edit";
+            // 
             // copyToolStripMenuItem
             // 
             this.copyToolStripMenuItem.Enabled = false;
@@ -508,7 +468,7 @@
             this.copyToolStripMenuItem.Name = "copyToolStripMenuItem";
             this.copyToolStripMenuItem.ShortcutKeyDisplayString = "Ctrl+C";
             this.copyToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.C)));
-            this.copyToolStripMenuItem.Size = new System.Drawing.Size(160, 22);
+            this.copyToolStripMenuItem.Size = new System.Drawing.Size(212, 22);
             this.copyToolStripMenuItem.Text = "Copy";
             this.copyToolStripMenuItem.Click += new System.EventHandler(this.copyToolStripMenuItem_Click);
             // 
@@ -519,7 +479,7 @@
             this.pasteToolStripMenuItem.Name = "pasteToolStripMenuItem";
             this.pasteToolStripMenuItem.ShortcutKeyDisplayString = "Ctrl+V";
             this.pasteToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.V)));
-            this.pasteToolStripMenuItem.Size = new System.Drawing.Size(160, 22);
+            this.pasteToolStripMenuItem.Size = new System.Drawing.Size(212, 22);
             this.pasteToolStripMenuItem.Text = "Paste";
             this.pasteToolStripMenuItem.Click += new System.EventHandler(this.pasteToolStripMenuItem_Click);
             // 
@@ -528,7 +488,9 @@
             this.prependSymbolToolStripMenuItem.Enabled = false;
             this.prependSymbolToolStripMenuItem.Image = global::McBitFont.Properties.Resources.action_add;
             this.prependSymbolToolStripMenuItem.Name = "prependSymbolToolStripMenuItem";
-            this.prependSymbolToolStripMenuItem.Size = new System.Drawing.Size(160, 22);
+            this.prependSymbolToolStripMenuItem.ShortcutKeyDisplayString = "Ctrl+Ins";
+            this.prependSymbolToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Insert)));
+            this.prependSymbolToolStripMenuItem.Size = new System.Drawing.Size(212, 22);
             this.prependSymbolToolStripMenuItem.Text = "Prepend symbol";
             this.prependSymbolToolStripMenuItem.Click += new System.EventHandler(this.prependSymbolToolStripMenuItem_Click);
             // 
@@ -537,7 +499,9 @@
             this.appendSymbolToolStripMenuItem.Enabled = false;
             this.appendSymbolToolStripMenuItem.Image = global::McBitFont.Properties.Resources.action_add;
             this.appendSymbolToolStripMenuItem.Name = "appendSymbolToolStripMenuItem";
-            this.appendSymbolToolStripMenuItem.Size = new System.Drawing.Size(160, 22);
+            this.appendSymbolToolStripMenuItem.ShortcutKeyDisplayString = "Ctrl+End";
+            this.appendSymbolToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.End)));
+            this.appendSymbolToolStripMenuItem.Size = new System.Drawing.Size(212, 22);
             this.appendSymbolToolStripMenuItem.Text = "Append symbol";
             this.appendSymbolToolStripMenuItem.Click += new System.EventHandler(this.prependSymbolToolStripMenuItem_Click);
             // 
@@ -546,7 +510,9 @@
             this.removeSymbolToolStripMenuItem.Enabled = false;
             this.removeSymbolToolStripMenuItem.Image = global::McBitFont.Properties.Resources.action_remove;
             this.removeSymbolToolStripMenuItem.Name = "removeSymbolToolStripMenuItem";
-            this.removeSymbolToolStripMenuItem.Size = new System.Drawing.Size(160, 22);
+            this.removeSymbolToolStripMenuItem.ShortcutKeyDisplayString = "Ctrl+Del";
+            this.removeSymbolToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Delete)));
+            this.removeSymbolToolStripMenuItem.Size = new System.Drawing.Size(212, 22);
             this.removeSymbolToolStripMenuItem.Text = "Remove symbol";
             this.removeSymbolToolStripMenuItem.Click += new System.EventHandler(this.removeSymbolToolStripMenuItem_Click);
             // 
@@ -554,10 +520,27 @@
             // 
             this.applyToolStripMenuItem.Image = global::McBitFont.Properties.Resources.action_check;
             this.applyToolStripMenuItem.Name = "applyToolStripMenuItem";
-            this.applyToolStripMenuItem.Size = new System.Drawing.Size(160, 22);
+            this.applyToolStripMenuItem.ShortcutKeyDisplayString = "Ctrl+Space";
+            this.applyToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Space)));
+            this.applyToolStripMenuItem.Size = new System.Drawing.Size(212, 22);
             this.applyToolStripMenuItem.Text = "Apply";
             this.applyToolStripMenuItem.Click += new System.EventHandler(this.button2_Click);
             // 
+            // toolsToolStripMenuItem
+            // 
+            this.toolsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.shiftUpToolStripMenuItem,
+            this.shiftDownToolStripMenuItem,
+            this.shiftLeftToolStripMenuItem,
+            this.shiftRightToolStripMenuItem,
+            this.invertToolStripMenuItem,
+            this.mirrorXToolStripMenuItem,
+            this.mirrorYToolStripMenuItem,
+            this.exportToolStripMenuItem});
+            this.toolsToolStripMenuItem.Name = "toolsToolStripMenuItem";
+            this.toolsToolStripMenuItem.Size = new System.Drawing.Size(46, 20);
+            this.toolsToolStripMenuItem.Text = "Tools";
+            // 
             // shiftUpToolStripMenuItem
             // 
             this.shiftUpToolStripMenuItem.Image = global::McBitFont.Properties.Resources.arrow_top;
@@ -628,11 +611,49 @@
             this.mirrorYToolStripMenuItem.Text = "Mirror Y";
             this.mirrorYToolStripMenuItem.Click += new System.EventHandler(this.btnMirrorY_Click);
             // 
+            // exportToolStripMenuItem
+            // 
+            this.exportToolStripMenuItem.Name = "exportToolStripMenuItem";
+            this.exportToolStripMenuItem.ShortcutKeyDisplayString = "Ctrl+E";
+            this.exportToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.E)));
+            this.exportToolStripMenuItem.Size = new System.Drawing.Size(197, 22);
+            this.exportToolStripMenuItem.Text = "Export";
+            this.exportToolStripMenuItem.Click += new System.EventHandler(this.button1_Click);
+            // 
+            // aboutToolStripMenuItem
+            // 
+            this.aboutToolStripMenuItem.Name = "aboutToolStripMenuItem";
+            this.aboutToolStripMenuItem.Size = new System.Drawing.Size(52, 20);
+            this.aboutToolStripMenuItem.Text = "About";
+            this.aboutToolStripMenuItem.Click += new System.EventHandler(this.aboutToolStripMenuItem_Click);
+            // 
+            // dlgSave
+            // 
+            this.dlgSave.DefaultExt = "mbf";
+            this.dlgSave.Filter = "McBitFont files|*.mbf|All files|*.*";
+            // 
+            // dlgOpen
+            // 
+            this.dlgOpen.DefaultExt = "mbf";
+            this.dlgOpen.Filter = "McBitFont files|*.mbf|All files|*.*";
+            // 
+            // btnBaseline
+            // 
+            this.btnBaseline.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnBaseline.Location = new System.Drawing.Point(615, 80);
+            this.btnBaseline.Name = "btnBaseline";
+            this.btnBaseline.Size = new System.Drawing.Size(75, 23);
+            this.btnBaseline.TabIndex = 18;
+            this.btnBaseline.Text = "Baseline";
+            this.btnBaseline.UseVisualStyleBackColor = true;
+            this.btnBaseline.Click += new System.EventHandler(this.btnBaseline_Click);
+            // 
             // MainForm
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(784, 561);
+            this.Controls.Add(this.btnBaseline);
             this.Controls.Add(this.btnApply);
             this.Controls.Add(this.btnExport);
             this.Controls.Add(this.label5);
@@ -717,6 +738,7 @@
         private System.Windows.Forms.ToolStripMenuItem appendSymbolToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem copyToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem pasteToolStripMenuItem;
+        private System.Windows.Forms.Button btnBaseline;
     }
 }
 

McBitFont/Form1.cs

@@ -37,6 +37,7 @@ namespace McBitFont {
         public struct SaveBlock {
             public bool monospaced;
             public int codepage;
+            public int baseline;
             public List<FrameMiniature> frames;
         }
 
@@ -50,11 +51,13 @@ namespace McBitFont {
         public bool monospaced = false;
         bool modified = false;
         bool prjModified = false;
-        public const string version = "1.1";
+        public const string version = "1.4";
         public string prjName = "Untitled";
         public int codepage = 1251;
         private FrameMiniature fbuf;
         private bool fbuffer = false;
+        public int baseline = 0;
+        public bool set_base = false;
 
         public MainForm() {
             InitializeComponent();
@@ -138,7 +141,7 @@ namespace McBitFont {
                 for (int i = 0; i < frames.Count; i++) {
                     frames[i] = frameResize(frames[i], (int)nudX.Value, dotHeight);
                     bmp = getMiniPictue(frames[i]);
-                    string s = frames[i].code.ToString();
+                    string s = frames[i].code.ToString().PadLeft(3, '0');
                     ilMiniatures.Images.RemoveByKey(s);
                     ilMiniatures.Images.Add(s, (Image)bmp);
                     miniList.Items[s].ImageKey = s;
@@ -155,7 +158,7 @@ namespace McBitFont {
             for (int i = 0; i < frames.Count; i++) {
                 frames[i] = frameResize(frames[i], dotWidth, (int)nudY.Value);
                 bmp = getMiniPictue(frames[i]);
-                string s = frames[i].code.ToString();
+                string s = frames[i].code.ToString().PadLeft(3, '0');
                 ilMiniatures.Images.RemoveByKey(s);
                 ilMiniatures.Images.Add(s, (Image)bmp);
                 miniList.Items[s].ImageKey = s;
@@ -275,6 +278,27 @@ namespace McBitFont {
         }
 
         private void dotPanel_MouseMove(object sender, MouseEventArgs e) {
+            Rectangle rect1, rect2;
+            if (set_base) {
+
+                int yy = pixelOffset + baseline * (cellSize + gap) - vScroll.Value - 1;
+                rect1 = new Rectangle(pixelOffset, yy, w, 2);
+                baseline = (e.Y - pixelOffset + vScroll.Value) / (cellSize + gap);
+
+                if (baseline >= dotHeight) baseline = dotHeight - 1;
+                if (baseline < 0) baseline = 0;
+
+                yy = pixelOffset + baseline * (cellSize + gap) - vScroll.Value - 1;
+                rect2 = new Rectangle(pixelOffset, yy, w, 2);
+
+                dotPanel.Invalidate(rect1);
+                dotPanel.Invalidate(rect2);
+
+                if (e.Button == MouseButtons.Left) {
+                    set_base = false;
+                    return;
+                }
+            }
             if (e.X >= w || e.X <= pixelOffset || e.Y >= h || e.Y <= pixelOffset) return;
             int i = (e.X - pixelOffset + hScroll.Value) / (cellSize + gap);
             int j = (e.Y - pixelOffset + vScroll.Value) / (cellSize + gap);
@@ -286,8 +310,9 @@ namespace McBitFont {
                 f.data[i, j] = true;
                 int x = pixelOffset + i * (cellSize + gap) - hScroll.Value;
                 int y = pixelOffset + j * (cellSize + gap) - vScroll.Value;
-                g.FillRectangle(sbb, x, y, cellSize, cellSize);
                 modified = true;
+                rect1 = new Rectangle(x, y, cellSize, cellSize);
+                dotPanel.Invalidate(rect1);
             }
             if (e.Button == MouseButtons.Right && f.data[i, j]) {
                 Graphics g = dotPanel.CreateGraphics();
@@ -295,8 +320,9 @@ namespace McBitFont {
                 f.data[i, j] = false;
                 int x = pixelOffset + i * (cellSize + gap) - hScroll.Value;
                 int y = pixelOffset + j * (cellSize + gap) - vScroll.Value;
-                g.FillRectangle(sbw, x, y, cellSize, cellSize);
                 modified = true;
+                rect1 = new Rectangle(x, y, cellSize, cellSize);
+                dotPanel.Invalidate(rect1);
             }
 
         }
@@ -450,9 +476,19 @@ namespace McBitFont {
                     }
                     if (f.data[i, j]) sb = sbb;
                     else sb = sbw;
-                    g.FillRectangle(sb, x, y, cellSize, cellSize);
+                    g.FillRectangle(sb, x, (baseline == j ? y+1 : y), cellSize, (baseline == j ? cellSize-1 : cellSize));
                 }
             }
+
+            if (baseline > 0 && gap > 0) {
+                x = pixelOffset - hScroll.Value;
+                y = pixelOffset + baseline * (cellSize + gap) - vScroll.Value;
+                g.DrawLine(
+                    new Pen(Color.Blue, 2),
+                    x, y,
+                    w, y
+                );
+            }
         }
 
         private void exitToolStripMenuItem_Click(object sender, EventArgs e) {
@@ -538,10 +574,10 @@ namespace McBitFont {
                     monospaced = form.rbMono.Checked;
                 }
                 lblType.Text = monospaced ? "Monospaced" : "Variable width / Single";
+                codepage = (form.cbEncoding.SelectedItem as New.EncodingItem).Code;
                 foreach (FrameMiniature ff in frames) {
                     var s = ff.code.ToString().PadLeft(3, '0');
                     ilMiniatures.Images.Add(s, (Image)getMiniPictue(ff));
-                    codepage =(form.cbEncoding.SelectedItem as New.EncodingItem).Code;
                     var sss = decodeSymbol(ff.code);
                     miniList.Items.Add(s, s+' '+append+sss, s);
                 }
@@ -550,11 +586,14 @@ namespace McBitFont {
                 miniList.Refresh();
                 form.Dispose();
 
+                baseline = 0;
+
                 prjName = "Untitled";
                 this.Text = "McBitFont " + version + " - " + prjName;
                 modified = false;
                 checkForAdd();
                 fbuffer = false;
+                dotPanel.Refresh();
             }
         }
 
@@ -597,6 +636,7 @@ namespace McBitFont {
                 sav.monospaced = monospaced;
                 sav.frames = frames;
                 sav.codepage = codepage;
+                sav.baseline = baseline;
                 BinaryFormatter formatter = new BinaryFormatter();
                 using (Stream ms = File.OpenWrite(dlgSave.FileName)) {
                     formatter.Serialize(ms, sav);
@@ -625,14 +665,16 @@ namespace McBitFont {
                 }
                 monospaced = sav.monospaced;
                 codepage = sav.codepage;
+                baseline = sav.baseline;
                 lblType.Text = monospaced ? "Monospaced" : "Variable width / Single";
                 frames = sav.frames;
                 miniList.Items.Clear();
                 ilMiniatures.Images.Clear();
                 foreach (FrameMiniature ff in frames) {
-                    var s = ff.code.ToString();
+                    var s = ff.code.ToString().PadLeft(3, '0');
+                    var sss = decodeSymbol(ff.code);
                     ilMiniatures.Images.Add(s, (Image)getMiniPictue(ff));
-                    miniList.Items.Add(s, s + ' ' + (char)ff.code, s);
+                    miniList.Items.Add(s, s + ' ' + sss, s);
                 }
                 nudX.ValueChanged -= nudX_ValueChanged;
                 nudY.ValueChanged -= nudY_ValueChanged;
@@ -713,6 +755,10 @@ namespace McBitFont {
             form.ShowDialog();
         }
 
+        private void btnBaseline_Click(object sender, EventArgs e) {
+            set_base = !set_base;
+        }
+
         private void MainForm_FormClosing(object sender, FormClosingEventArgs e) {
             if (prjModified) {
                 if (MessageBox.Show("The project is modified.\nAre you sure you want to quit?", "Are you sure?", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No) {

McBitFont/McBitFont.csproj

@@ -12,6 +12,21 @@
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <Deterministic>true</Deterministic>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -177,5 +192,17 @@
     <None Include="Resources\icon_32.png" />
     <None Include="Resources\icon.png" />
   </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include=".NETFramework,Version=v4.7.2">
+      <Visible>False</Visible>
+      <ProductName>Microsoft .NET Framework 4.7.2 %28x86 и x64%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

McBitFont/Properties/AssemblyInfo.cs

@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("McBitFont")]
-[assembly: AssemblyCopyright("Anton Mukhin © 2023")]
+[assembly: AssemblyCopyright("© Anton Mukhin, 2023")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // Можно задать все значения или принять номера сборки и редакции по умолчанию 
 // используя "*", как показано ниже:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.5.0.0")]
+[assembly: AssemblyFileVersion("1.5.0.0")]

README.md

@@ -1,3 +1,37 @@
 # McBitFont
 
-pixel based Font to C arrays converter
+McFLY's Bit Font and Image Editor
+
+Features:
+- Generate a project based on a font installed in the system
+- Basic pixel manipulations: shift, flip, invert, etc...
+- Save / Load your project for later edits
+- Export as a C array in different formats
+
+Requires .Net Framework 4.7+
+
+Some basic hints on the interface:
+- Mouse 1 to mark a puxel black
+- Mouse 2 to mark a puxel white
+- Drag the mouse holding a button to draw pixels
+- Mouse Scroll to scroll up and down
+- Crtl + scroll to scroll left and right
+- Shift + scroll to zoom
+
+
+Download in the Releases section!
+
+
+### Screenshots:
+
+Main window
+
+![Main window](/images/Screenshot_01.png)
+
+New project dialog
+
+![New project](/images/Screenshot_02.png)
+
+Export dialog
+
+![Export](/images/Screenshot_03.png)