Merge branch 'fix-broken-resize'

McBitFont/Form1.cs

@@ -51,7 +51,7 @@ namespace McBitFont {
         public bool monospaced = false;
         bool modified = false;
         bool prjModified = false;
-        public const string version = "1.3";
+        public const string version = "1.4";
         public string prjName = "Untitled";
         public int codepage = 1251;
         private FrameMiniature fbuf;
@@ -141,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;
@@ -158,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;
@@ -278,17 +278,18 @@ 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;
-                Rectangle rect1 = new Rectangle(pixelOffset, yy, w, 3);
+                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;
-                Rectangle rect2 = new Rectangle(pixelOffset, yy, w, 3);
+                rect2 = new Rectangle(pixelOffset, yy, w, 2);
 
                 dotPanel.Invalidate(rect1);
                 dotPanel.Invalidate(rect2);
@@ -309,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();
@@ -318,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);
             }
 
         }
@@ -473,13 +476,13 @@ 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 - 1;
+                y = pixelOffset + baseline * (cellSize + gap) - vScroll.Value;
                 g.DrawLine(
                     new Pen(Color.Blue, 2),
                     x, y,
@@ -571,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);
                 }
@@ -583,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();
             }
         }
 
@@ -666,8 +672,9 @@ namespace McBitFont {
                 ilMiniatures.Images.Clear();
                 foreach (FrameMiniature ff in frames) {
                     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;

McBitFont/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // Можно задать все значения или принять номера сборки и редакции по умолчанию 
 // используя "*", как показано ниже:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.3.0.0")]
+[assembly: AssemblyVersion("1.5.0.0")]
-[assembly: AssemblyFileVersion("1.3.0.0")]
+[assembly: AssemblyFileVersion("1.5.0.0")]