added goto and search panels and format switch for all input panels

movAX13h · movAX13h · commit a8cb09fca8bd · 2017-05-17T00:02:05.000+02:00
diff --git a/Binmap/Controls/BinList.cs b/Binmap/Controls/BinList.cs
@@ -41,14 +41,6 @@ public Point ItemSpace
             }
         }
 
-        public int NumItems
-        {
-            get
-            {
-                return items.Count;
-            }
-        }
-
         #region IScrollbarTarget and IInput implementations
         Rectangle IScrollbarTarget.ScrollRectangle { get { return Transform; } }
         public int ScrollStepSize { get { return 100; } }
@@ -373,6 +365,11 @@ public override void Resize(int w, int h)
             if (!layoutLocked) Layout();
         }
 
+        public void ScrollTo(int targetPosition)
+        {
+            scrollbar.ScrollTo(targetPosition);
+        }
+
         public void OnScroll(int scrollPosition)
         {
             startIndex = scrollPosition;
diff --git a/Binmap/Controls/BinListItem.cs b/Binmap/Controls/BinListItem.cs
@@ -107,6 +107,7 @@ public override void Draw(SpriteBatch spriteBatch)
                 commentInput.Transform.X = parentRect.Width - CommentColumnWidth - Transform.X + 2;
                 commentInput.Transform.Y = 0;
                 commentInput.Visible = true;
+                commentInput.Font = Main.DefaultFont;
             }
             else commentInput.Visible = false;
 
diff --git a/Binmap/Controls/Button.cs b/Binmap/Controls/Button.cs
@@ -2,10 +2,11 @@
 using Microsoft.Xna.Framework;
 using System;
 using Microsoft.Xna.Framework.Graphics;
+using Microsoft.Xna.Framework.Input;
 
 namespace Binmap.Controls
 {
-    class Button : Control
+    class Button : Control, IInput
     {
         public object Tag = null;
         private Action<Button> clickCallback;
@@ -18,6 +19,9 @@ class Button : Control
 
         public SpriteFont Font = Main.FontL;
 
+        public bool Focused { set { } }
+        public Action<IInput> OnChangeCallback { set { } }
+
         public Button(int w, int h, string text, Color textColor, Action<Button> callback = null, object tag = null) : base(0, 0, w, h, Main.BorderColor)
         {
             MouseEnabled = true;
@@ -29,6 +33,7 @@ public Button(int w, int h, string text, Color textColor, Action<Button> callbac
 
         protected override void OnMouseDown()
         {
+            Main.SetFocus(this);
             clickCallback?.Invoke(this);
         }
 
@@ -46,7 +51,18 @@ public override void Draw(SpriteBatch spriteBatch)
             rect.X += (int)Math.Floor((Transform.Width - size.X) / 2) + 1;
             rect.Y += (int)Math.Floor((Transform.Height - size.Y) / 2);
 
+            if (Font == Main.FontS)
+            {
+                rect.X -= 1;
+                rect.Y += 3;
+            }
+
             spriteBatch.DrawString(Font, Text, new Vector2(rect.X, rect.Y), TextColor);
         }
+
+        public bool ProcessKey(Keys key)
+        {
+            throw new NotImplementedException();
+        }
     }
 }
diff --git a/Binmap/Controls/Scrollbar.cs b/Binmap/Controls/Scrollbar.cs
@@ -85,7 +85,7 @@ private void thumbClicked(Button btn)
         public void Layout()
         {
             int availableHeight = Transform.Height - 2 * buttonA.Transform.Height;
-            thumb.Resize(Transform.Width - 4, Math.Max(thumb.Transform.Width, Math.Min(availableHeight, availableHeight * target.NumVisible / target.MaxScrollValue)));
+            thumb.Resize(Transform.Width - 4, Math.Max(thumb.Transform.Width, Math.Min(availableHeight, availableHeight * target.NumVisible / Math.Max(1, target.MaxScrollValue))));
             availableHeight -= thumb.Transform.Height;
             float s = (float)ScrollPosition / (Math.Max(1, target.MaxScrollValue - target.NumVisible));
             thumb.Transform.Y = buttonA.Transform.Height + (int)Math.Round(availableHeight * s);
diff --git a/Binmap/Controls/TextInput.cs b/Binmap/Controls/TextInput.cs
@@ -10,30 +10,18 @@ class TextInput : Container, IInput
     {
         public string Text = "";
         private bool focused = false;
-        public bool Focused
-        {
-            set
-            {
-                focused = value;
-            }
-        }
-
+        public bool Focused { set { focused = value; } }
         public Color FocusFrameColor = Main.TrackColor;
+        public Color TextColor = Color.Yellow;
 
-        private Action<IInput> onChangeCallback = null;
-        public Action<IInput> OnChangeCallback
-        {
-            set
-            {
-                onChangeCallback = value;
-            }
-        }
+        public SpriteFont Font = Main.DefaultFont;
+
+        public Action<IInput> OnChangeCallback { private get; set; }
+        public Action<IInput> OnSubmitCallback { private get; set; }
 
         private int caretPosition = 0;
         private float caretTime = 0;
 
-        public Color TextColor = Color.Yellow;
-
         public TextInput(int x, int y, int w, int h) : base(x, y, w, h, Main.BackgroundColor)
         {
             MouseEnabled = true;
@@ -47,6 +35,8 @@ protected override void OnMouseDown()
         
         public override void Update(float time, float dTime)
         {
+            if (!Visible) return;
+
             base.Update(time, dTime);
             caretTime += dTime;
         }
@@ -65,8 +55,8 @@ public override void Draw(SpriteBatch spriteBatch)
             // text
             int x = worldRect.X + 2;
             int y = worldRect.Y - 1;
-            if (Main.DefaultFont == Main.FontS) y += 4;
-            spriteBatch.DrawString(Main.DefaultFont, Text, new Vector2(x, y), TextColor);
+            if (Font == Main.FontS) y += 4;
+            spriteBatch.DrawString(Font, Text, new Vector2(x, y), TextColor);
 
             // caret
             if (caretPosition > Text.Length) caretPosition = Text.Length;
@@ -76,7 +66,7 @@ public override void Draw(SpriteBatch spriteBatch)
 
                 Vector2 textSize = Main.DefaultFont.MeasureString(left);
                 x += (int)Math.Round(textSize.X);
-                if (Main.DefaultFont == Main.FontL) y += 3;
+                if (Font == Main.FontL) y += 3;
                 else y -= 1;
 
                 spriteBatch.Draw(Main.WhiteTexture, new Rectangle(x, y, 1, Transform.Height - 4), Color.White);
@@ -130,52 +120,52 @@ public bool ProcessKey(Keys key)
                     if (!Main.KeyboardState.IsKeyDown(Keys.LeftShift) && !Main.KeyboardState.IsKeyDown(Keys.RightShift)) s = s.ToLower();
 
                     Text = left + s + right;
-                    onChangeCallback?.Invoke(this);
+                    OnChangeCallback?.Invoke(this);
                     caretPosition += 1;
                     break;
 
                 case Keys.Space:
                     Text = left + " " + right;
-                    onChangeCallback?.Invoke(this);
+                    OnChangeCallback?.Invoke(this);
                     caretPosition += 1;
                     break;
 
                 case Keys.Add:
                 case Keys.OemPlus:
                     Text = left + "+" + right;
-                    onChangeCallback?.Invoke(this);
+                    OnChangeCallback?.Invoke(this);
                     caretPosition += 1;
                     break;
 
                 case Keys.Subtract:
                 case Keys.OemMinus:
                     Text = left + "-" + right;
-                    onChangeCallback?.Invoke(this);
+                    OnChangeCallback?.Invoke(this);
                     caretPosition += 1;
                     break;
 
                 case Keys.Decimal:
                 case Keys.OemComma:
                     Text = left + "," + right;
-                    onChangeCallback?.Invoke(this);
+                    OnChangeCallback?.Invoke(this);
                     caretPosition += 1;
                     break;
 
                 case Keys.OemPeriod:
                     Text = left + "." + right;
-                    onChangeCallback?.Invoke(this);
+                    OnChangeCallback?.Invoke(this);
                     caretPosition += 1;
                     break;
 
                 case Keys.Multiply:
                     Text = left + "*" + right;
-                    onChangeCallback?.Invoke(this);
+                    OnChangeCallback?.Invoke(this);
                     caretPosition += 1;
                     break;
 
                 case Keys.Divide:
                     Text = left + "/" + right;
-                    onChangeCallback?.Invoke(this);
+                    OnChangeCallback?.Invoke(this);
                     caretPosition += 1;
                     break;
 
@@ -220,28 +210,29 @@ public bool ProcessKey(Keys key)
                     }
 
                     Text = left + s + right;
-                    onChangeCallback?.Invoke(this);
+                    OnChangeCallback?.Invoke(this);
                     caretPosition += 1;
                     break;
 
                 case Keys.Delete:
                     if (right.Length > 0)
                     {
                         Text = left + right.Substring(1);
-                        onChangeCallback?.Invoke(this);
+                        OnChangeCallback?.Invoke(this);
                     }
                     break;
 
                 case Keys.Back:
                     if (left.Length > 0)
                     {
                         Text = left.Substring(0, left.Length - 1) + right;
-                        onChangeCallback?.Invoke(this);
+                        OnChangeCallback?.Invoke(this);
                         caretPosition -= 1;
                     }
                     break;
 
                 case Keys.Enter:
+                    OnSubmitCallback?.Invoke(this);
                     Main.SetFocus(null);
                     break;
                 
diff --git a/Binmap/Main.cs b/Binmap/Main.cs
@@ -45,7 +45,7 @@ public static void SetFocus(IInput control)
             if (focusedControl != null) focusedControl.Focused = true;
         }
 
-        public static string Version = "1.3";
+        public static string Version = "1.4";
 
         Keys[] prevPressed;
         GraphicsDeviceManager graphics;
@@ -138,7 +138,7 @@ private void loadFile(string filename)
                     else b = " (" + b + ")";
                 }
 
-                Window.Title = "Binmap " + Version + " - " + a + b;                
+                Window.Title = "Binmap " + Version + " - " + a + b + ", " + layouter.NumBytes + " bytes";
             }
             else Forms.MessageBox.Show(layouter.LastError, "Sorry!", Forms.MessageBoxButtons.OK, Forms.MessageBoxIcon.Error);
         }
diff --git a/Binmap/Screens/Layouter.cs b/Binmap/Screens/Layouter.cs
diff --git a/README.md b/README.md

Original file line number	Diff line number	Diff line change
`@@ -41,14 +41,6 @@ public Point ItemSpace`
`41`	`41`	`}`
`42`	`42`	`}`
`43`	`43`
`44`		`- public int NumItems`
`45`		`- {`
`46`		`- get`
`47`		`- {`
`48`		`- return items.Count;`
`49`		`- }`
`50`		`- }`
`51`		`-`
`52`	`44`	`#region IScrollbarTarget and IInput implementations`
`53`	`45`	`Rectangle IScrollbarTarget.ScrollRectangle { get { return Transform; } }`
`54`	`46`	`public int ScrollStepSize { get { return 100; } }`
`@@ -373,6 +365,11 @@ public override void Resize(int w, int h)`
`373`	`365`	`if (!layoutLocked) Layout();`
`374`	`366`	`}`
`375`	`367`
	`368`	`+ public void ScrollTo(int targetPosition)`
	`369`	`+ {`
	`370`	`+ scrollbar.ScrollTo(targetPosition);`
	`371`	`+ }`
	`372`	`+`
`376`	`373`	`public void OnScroll(int scrollPosition)`
`377`	`374`	`{`
`378`	`375`	`startIndex = scrollPosition;`
Original file line number	Diff line number	Diff line change
`@@ -107,6 +107,7 @@ public override void Draw(SpriteBatch spriteBatch)`
`107`	`107`	`commentInput.Transform.X = parentRect.Width - CommentColumnWidth - Transform.X + 2;`
`108`	`108`	`commentInput.Transform.Y = 0;`
`109`	`109`	`commentInput.Visible = true;`
	`110`	`+ commentInput.Font = Main.DefaultFont;`
`110`	`111`	`}`
`111`	`112`	`else commentInput.Visible = false;`
`112`	`113`
Original file line number	Diff line number	Diff line change
`@@ -2,10 +2,11 @@`
`2`	`2`	`using Microsoft.Xna.Framework;`
`3`	`3`	`using System;`
`4`	`4`	`using Microsoft.Xna.Framework.Graphics;`
	`5`	`+using Microsoft.Xna.Framework.Input;`
`5`	`6`
`6`	`7`	`namespace Binmap.Controls`
`7`	`8`	`{`
`8`		`- class Button : Control`
	`9`	`+ class Button : Control, IInput`
`9`	`10`	`{`
`10`	`11`	`public object Tag = null;`
`11`	`12`	`private Action<Button> clickCallback;`
`@@ -18,6 +19,9 @@ class Button : Control`
`18`	`19`
`19`	`20`	`public SpriteFont Font = Main.FontL;`
`20`	`21`
	`22`	`+ public bool Focused { set { } }`
	`23`	`+ public Action<IInput> OnChangeCallback { set { } }`
	`24`	`+`
`21`	`25`	`public Button(int w, int h, string text, Color textColor, Action<Button> callback = null, object tag = null) : base(0, 0, w, h, Main.BorderColor)`
`22`	`26`	`{`
`23`	`27`	`MouseEnabled = true;`
`@@ -29,6 +33,7 @@ public Button(int w, int h, string text, Color textColor, Action<Button> callbac`
`29`	`33`
`30`	`34`	`protected override void OnMouseDown()`
`31`	`35`	`{`
	`36`	`+ Main.SetFocus(this);`
`32`	`37`	`clickCallback?.Invoke(this);`
`33`	`38`	`}`
`34`	`39`
`@@ -46,7 +51,18 @@ public override void Draw(SpriteBatch spriteBatch)`
`46`	`51`	`rect.X += (int)Math.Floor((Transform.Width - size.X) / 2) + 1;`
`47`	`52`	`rect.Y += (int)Math.Floor((Transform.Height - size.Y) / 2);`
`48`	`53`
	`54`	`+ if (Font == Main.FontS)`
	`55`	`+ {`
	`56`	`+ rect.X -= 1;`
	`57`	`+ rect.Y += 3;`
	`58`	`+ }`
	`59`	`+`
`49`	`60`	`spriteBatch.DrawString(Font, Text, new Vector2(rect.X, rect.Y), TextColor);`
`50`	`61`	`}`
	`62`	`+`
	`63`	`+ public bool ProcessKey(Keys key)`
	`64`	`+ {`
	`65`	`+ throw new NotImplementedException();`
	`66`	`+ }`
`51`	`67`	`}`
`52`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ private void thumbClicked(Button btn)`
`85`	`85`	`public void Layout()`
`86`	`86`	`{`
`87`	`87`	`int availableHeight = Transform.Height - 2 * buttonA.Transform.Height;`
`88`		`- thumb.Resize(Transform.Width - 4, Math.Max(thumb.Transform.Width, Math.Min(availableHeight, availableHeight * target.NumVisible / target.MaxScrollValue)));`
	`88`	`+ thumb.Resize(Transform.Width - 4, Math.Max(thumb.Transform.Width, Math.Min(availableHeight, availableHeight * target.NumVisible / Math.Max(1, target.MaxScrollValue))));`
`89`	`89`	`availableHeight -= thumb.Transform.Height;`
`90`	`90`	`float s = (float)ScrollPosition / (Math.Max(1, target.MaxScrollValue - target.NumVisible));`
`91`	`91`	`thumb.Transform.Y = buttonA.Transform.Height + (int)Math.Round(availableHeight * s);`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public static void SetFocus(IInput control)`
`45`	`45`	`if (focusedControl != null) focusedControl.Focused = true;`
`46`	`46`	`}`
`47`	`47`
`48`		`- public static string Version = "1.3";`
	`48`	`+ public static string Version = "1.4";`
`49`	`49`
`50`	`50`	`Keys[] prevPressed;`
`51`	`51`	`GraphicsDeviceManager graphics;`
`@@ -138,7 +138,7 @@ private void loadFile(string filename)`
`138`	`138`	`else b = " (" + b + ")";`
`139`	`139`	`}`
`140`	`140`
`141`		`- Window.Title = "Binmap " + Version + " - " + a + b;`
	`141`	`+ Window.Title = "Binmap " + Version + " - " + a + b + ", " + layouter.NumBytes + " bytes";`
`142`	`142`	`}`
`143`	`143`	`else Forms.MessageBox.Show(layouter.LastError, "Sorry!", Forms.MessageBoxButtons.OK, Forms.MessageBoxIcon.Error);`
`144`	`144`	`}`