最大化時のレイアウト乱れの修正

diff --git a/Fugashi/BitSwitch.cs b/Fugashi/BitSwitch.cs
index 8aaf987..bea85ef 100755 (executable)
--- a/Fugashi/BitSwitch.cs
+++ b/Fugashi/BitSwitch.cs
@@ -85,7 +85,7 @@ namespace Fugashi
 \r
         private void CreateNormalBackgroundImage()\r
         {\r
-            if (normal is Bitmap && normal.Height == Height)\r
+            if (normal is Bitmap && normal.Size == Size)\r
             {\r
                 return;\r
             }\r
@@ -95,18 +95,17 @@ namespace Fugashi
 \r
         private void CreateHoverBackgroundImage()\r
         {\r
-            if (hover is Bitmap && hover.Height == Height)\r
+            if (hover is Bitmap && hover.Size == Size)\r
             {\r
                 return;\r
             }\r
             hover = CreateBackGroundImage(Color.LemonChiffon, Color.Gold,\r
                                             Color.Orange, Color.DarkOrange);\r
-            \r
         }\r
 \r
         private void CreateExponentBackgroundImage()\r
         {\r
-            if (exponent is Bitmap && exponent.Height == Height)\r
+            if (exponent is Bitmap && exponent.Size == Size)\r
             {\r
                 return;\r
             }\r
@@ -166,8 +165,7 @@ namespace Fugashi
             }\r
             using (Pen p = new Pen(BorderColor, 1))\r
             {\r
-                bool rightEnd = ((Anchor & AnchorStyles.Right) == 0);\r
-                int width = rightEnd ? Width - 1 : Width;\r
+                int width = Tag != null ? Width - 1 : Width;\r
                 e.Graphics.DrawRectangle(p, 0, 0, width, Height - 1);\r
             }\r
         }\r

diff --git a/Fugashi/BitSwitches4.Designer.cs b/Fugashi/BitSwitches4.Designer.cs
index 82cb9b9..447a4ad 100755 (executable)
--- a/Fugashi/BitSwitches4.Designer.cs
+++ b/Fugashi/BitSwitches4.Designer.cs
@@ -54,11 +54,12 @@
             // table\r
             // \r
             this.table.BackColor = System.Drawing.Color.Transparent;\r
-            this.table.ColumnCount = 4;\r
+            this.table.ColumnCount = 5;\r
             this.table.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 25F));\r
             this.table.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 25F));\r
             this.table.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 25F));\r
             this.table.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 25F));\r
+            this.table.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());\r
             this.table.Controls.Add(this.b3, 0, 0);\r
             this.table.Controls.Add(this.b2, 1, 0);\r
             this.table.Controls.Add(this.b0, 3, 0);\r
@@ -78,6 +79,7 @@
             this.b3.BackColor = System.Drawing.Color.Transparent;\r
             this.b3.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("b3.BackgroundImage")));\r
             this.b3.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(213)))), ((int)(((byte)(223)))), ((int)(((byte)(229)))));\r
+            this.b3.IsExponential = false;\r
             this.b3.Location = new System.Drawing.Point(0, 0);\r
             this.b3.Margin = new System.Windows.Forms.Padding(0);\r
             this.b3.Name = "b3";\r
@@ -93,6 +95,7 @@
             this.b2.BackColor = System.Drawing.Color.Transparent;\r
             this.b2.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("b2.BackgroundImage")));\r
             this.b2.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(213)))), ((int)(((byte)(223)))), ((int)(((byte)(229)))));\r
+            this.b2.IsExponential = false;\r
             this.b2.Location = new System.Drawing.Point(14, 0);\r
             this.b2.Margin = new System.Windows.Forms.Padding(0);\r
             this.b2.Name = "b2";\r
@@ -102,17 +105,20 @@
             // \r
             // b0\r
             // \r
-            this.b0.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)\r
-                        | System.Windows.Forms.AnchorStyles.Left)));\r
+            this.b0.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)\r
+                        | System.Windows.Forms.AnchorStyles.Left)\r
+                        | System.Windows.Forms.AnchorStyles.Right)));\r
             this.b0.BackColor = System.Drawing.Color.Transparent;\r
             this.b0.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("b0.BackgroundImage")));\r
             this.b0.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(213)))), ((int)(((byte)(223)))), ((int)(((byte)(229)))));\r
+            this.b0.IsExponential = false;\r
             this.b0.Location = new System.Drawing.Point(42, 0);\r
             this.b0.Margin = new System.Windows.Forms.Padding(0);\r
             this.b0.Name = "b0";\r
             this.b0.Size = new System.Drawing.Size(14, 30);\r
             this.b0.State = false;\r
             this.b0.TabIndex = 0;\r
+            this.b0.Tag = "true";\r
             // \r
             // b1\r
             // \r
@@ -122,6 +128,7 @@
             this.b1.BackColor = System.Drawing.Color.Transparent;\r
             this.b1.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("b1.BackgroundImage")));\r
             this.b1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(213)))), ((int)(((byte)(223)))), ((int)(((byte)(229)))));\r
+            this.b1.IsExponential = false;\r
             this.b1.Location = new System.Drawing.Point(28, 0);\r
             this.b1.Margin = new System.Windows.Forms.Padding(0);\r
             this.b1.Name = "b1";\r

diff --git a/Fugashi/MainForm.Designer.cs b/Fugashi/MainForm.Designer.cs
index f494496..db85970 100755 (executable)
--- a/Fugashi/MainForm.Designer.cs
+++ b/Fugashi/MainForm.Designer.cs
@@ -346,6 +346,7 @@ namespace Fugashi
             this.table.Controls.Add(this.bits0, 8, 0);\r
             this.table.Location = new System.Drawing.Point(21, 156);\r
             this.table.Margin = new System.Windows.Forms.Padding(12, 3, 12, 3);\r
+            this.table.MaximumSize = new System.Drawing.Size(600, 120);\r
             this.table.Name = "table";\r
             this.table.RowCount = 2;\r
             this.table.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));\r