サイズ変更時にBitSwitchの背景が正しく設定されるよう修正

diff --git a/Fugashi/BitSwitch.cs b/Fugashi/BitSwitch.cs
index bea85ef..9f37ef1 100755 (executable)
--- a/Fugashi/BitSwitch.cs
+++ b/Fugashi/BitSwitch.cs
@@ -60,11 +60,7 @@ namespace Fugashi
             set\r
             {\r
                 isExponential = value;\r
-                if (BackgroundImage != hover)\r
-                {\r
-                    BackgroundImage = isExponential ? exponent : normal;\r
-                    Update();\r
-                }\r
+                UpdateBackgroundImage();\r
             }\r
         }\r
 \r
@@ -76,11 +72,7 @@ namespace Fugashi
             {\r
                 BorderColor = Color.FromArgb(0xD5, 0xDF, 0xE5);\r
             }\r
-\r
-            CreateNormalBackgroundImage();\r
-            CreateHoverBackgroundImage();\r
-            CreateExponentBackgroundImage();\r
-            BackgroundImage = normal;\r
+            UpdateBackgroundImage();\r
         }\r
 \r
         private void CreateNormalBackgroundImage()\r
@@ -114,7 +106,7 @@ namespace Fugashi
         }\r
 \r
         private Bitmap CreateBackGroundImage(\r
-            Color hilight, Color light, Color face, Color dark)\r
+                            Color hilight, Color light, Color face, Color dark)\r
         {\r
             Bitmap bmp  = new Bitmap(Width, Height);\r
             Graphics g = Graphics.FromImage(bmp);\r
@@ -181,10 +173,23 @@ namespace Fugashi
 \r
         private void BitSwitch_SizeChanged(object sender, EventArgs e)\r
         {\r
+            UpdateBackgroundImage();\r
+        }\r
+\r
+        private void UpdateBackgroundImage()\r
+        {\r
+            bool mouseOver = BackgroundImage == hover;\r
             CreateNormalBackgroundImage();\r
             CreateHoverBackgroundImage();\r
             CreateExponentBackgroundImage();\r
-            BackgroundImage = normal;\r
+            if (!mouseOver)\r
+            {\r
+                BackgroundImage = IsExponential ? exponent : normal;\r
+            }\r
+            else\r
+            {\r
+                BackgroundImage = hover;\r
+            }\r
         }\r
     }\r
 }\r

diff --git a/Fugashi/BitSwitches4.Designer.cs b/Fugashi/BitSwitches4.Designer.cs
index 447a4ad..7b41db2 100755 (executable)
--- a/Fugashi/BitSwitches4.Designer.cs
+++ b/Fugashi/BitSwitches4.Designer.cs
@@ -44,9 +44,9 @@
                         | System.Windows.Forms.AnchorStyles.Right)));\r
             this.label.Font = new System.Drawing.Font("Tahoma", 8F);\r
             this.label.ForeColor = System.Drawing.Color.MidnightBlue;\r
-            this.label.Location = new System.Drawing.Point(33, 0);\r
+            this.label.Location = new System.Drawing.Point(28, 0);\r
             this.label.Name = "label";\r
-            this.label.Size = new System.Drawing.Size(27, 16);\r
+            this.label.Size = new System.Drawing.Size(23, 13);\r
             this.label.TabIndex = 38;\r
             this.label.Text = "0";\r
             this.label.TextAlign = System.Drawing.ContentAlignment.BottomRight;\r
@@ -64,11 +64,11 @@
             this.table.Controls.Add(this.b2, 1, 0);\r
             this.table.Controls.Add(this.b0, 3, 0);\r
             this.table.Controls.Add(this.b1, 2, 0);\r
-            this.table.Location = new System.Drawing.Point(0, 19);\r
+            this.table.Location = new System.Drawing.Point(0, 16);\r
             this.table.Name = "table";\r
             this.table.RowCount = 1;\r
             this.table.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));\r
-            this.table.Size = new System.Drawing.Size(56, 30);\r
+            this.table.Size = new System.Drawing.Size(47, 25);\r
             this.table.TabIndex = 39;\r
             // \r
             // b3\r
@@ -78,12 +78,13 @@
                         | System.Windows.Forms.AnchorStyles.Right)));\r
             this.b3.BackColor = System.Drawing.Color.Transparent;\r
             this.b3.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("b3.BackgroundImage")));\r
+            this.b3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;\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
-            this.b3.Size = new System.Drawing.Size(14, 30);\r
+            this.b3.Size = new System.Drawing.Size(11, 25);\r
             this.b3.State = false;\r
             this.b3.TabIndex = 3;\r
             // \r
@@ -94,12 +95,13 @@
                         | System.Windows.Forms.AnchorStyles.Right)));\r
             this.b2.BackColor = System.Drawing.Color.Transparent;\r
             this.b2.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("b2.BackgroundImage")));\r
+            this.b2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;\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.Location = new System.Drawing.Point(11, 0);\r
             this.b2.Margin = new System.Windows.Forms.Padding(0);\r
             this.b2.Name = "b2";\r
-            this.b2.Size = new System.Drawing.Size(14, 30);\r
+            this.b2.Size = new System.Drawing.Size(11, 25);\r
             this.b2.State = false;\r
             this.b2.TabIndex = 2;\r
             // \r
@@ -110,12 +112,13 @@
                         | 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.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;\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.Location = new System.Drawing.Point(33, 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.Size = new System.Drawing.Size(11, 25);\r
             this.b0.State = false;\r
             this.b0.TabIndex = 0;\r
             this.b0.Tag = "true";\r
@@ -127,23 +130,24 @@
                         | System.Windows.Forms.AnchorStyles.Right)));\r
             this.b1.BackColor = System.Drawing.Color.Transparent;\r
             this.b1.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("b1.BackgroundImage")));\r
+            this.b1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;\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.Location = new System.Drawing.Point(22, 0);\r
             this.b1.Margin = new System.Windows.Forms.Padding(0);\r
             this.b1.Name = "b1";\r
-            this.b1.Size = new System.Drawing.Size(14, 30);\r
+            this.b1.Size = new System.Drawing.Size(11, 25);\r
             this.b1.State = false;\r
             this.b1.TabIndex = 1;\r
             // \r
             // BitSwitches4\r
             // \r
-            this.AutoScaleDimensions = new System.Drawing.SizeF(115F, 115F);\r
+            this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);\r
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;\r
             this.Controls.Add(this.table);\r
             this.Controls.Add(this.label);\r
             this.Name = "BitSwitches4";\r
-            this.Size = new System.Drawing.Size(60, 52);\r
+            this.Size = new System.Drawing.Size(50, 43);\r
             this.SizeChanged += new System.EventHandler(this.BitSwitches4_SizeChanged);\r
             this.table.ResumeLayout(false);\r
             this.ResumeLayout(false);\r

diff --git a/Fugashi/BitSwitches4.resx b/Fugashi/BitSwitches4.resx
index 469e70d..368d7ba 100755 (executable)
--- a/Fugashi/BitSwitches4.resx
+++ b/Fugashi/BitSwitches4.resx
@@ -120,42 +120,42 @@
   <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />\r
   <data name="b3.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">\r
     <value>\r
-        iVBORw0KGgoAAAANSUhEUgAAAA4AAAAeCAYAAAAcni9KAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8\r
-        YQUAAAAJcEhZcwAAEa8AABGvAff9S4QAAADKSURBVDhPnc5pCsJgDIThuf8Zu7vVFhFRRFq3Sb4cINPA\r
-        y/x6IPhtPHw+2yTW9evSVgnLUqCtEl6v8qutEp7PAm2V8HgUaKuE+71AWyXcbm+Htkq4Xgu0VcLlUqCt\r
-        EuZ5dWirhGkq0FYJ47g4tFVCVVUObZVQ17VDWyXCJmBDmI+wDdgS5iPsAnaE+dA0vUNbJcIh4ECYD227\r
-        c2irRLgPuCfMR3gIeCDMR3gMeCTMh647ObRVIhwDjoT5CM8Bz4T5CCeH6qHv59+W/p0oMG24BjG/AAAA\r
-        AElFTkSuQmCC\r
+        iVBORw0KGgoAAAANSUhEUgAAAAsAAAAZCAYAAADnstS2AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8\r
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAKtJREFUOE+VztEK\r
+        gzAQRNHp//+imiiVpiIiiIi11u5s8pyNC5d5OYQ8LjmU3nmSlx2O46eSa4V9j5hrhW2L/+BaYV0j5lph\r
+        WSLmWmGev4q5VpimiLlWGMdDMdcKwxAx1wohfBRzrVBVlWKuFeq6Vsy1EuwSdoLzCfYJe8H50DStYq6V\r
+        4C7hTnA+OPdUzLW6i/v0ci8v54P3L8VcK8Eh4SA4n+C34pJD2w5XaX9xMuf+td64xAAAAABJRU5ErkJg\r
+        gg==\r
 </value>\r
   </data>\r
   <data name="b2.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">\r
     <value>\r
-        iVBORw0KGgoAAAANSUhEUgAAAA4AAAAeCAYAAAAcni9KAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8\r
-        YQUAAAAJcEhZcwAAEa8AABGvAff9S4QAAADKSURBVDhPnc5pCsJgDIThuf8Zu7vVFhFRRFq3Sb4cINPA\r
-        y/x6IPhtPHw+2yTW9evSVgnLUqCtEl6v8qutEp7PAm2V8HgUaKuE+71AWyXcbm+Htkq4Xgu0VcLlUqCt\r
-        EuZ5dWirhGkq0FYJ47g4tFVCVVUObZVQ17VDWyXCJmBDmI+wDdgS5iPsAnaE+dA0vUNbJcIh4ECYD227\r
-        c2irRLgPuCfMR3gIeCDMR3gMeCTMh647ObRVIhwDjoT5CM8Bz4T5CCeH6qHv59+W/p0oMG24BjG/AAAA\r
-        AElFTkSuQmCC\r
+        iVBORw0KGgoAAAANSUhEUgAAAAsAAAAZCAYAAADnstS2AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8\r
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAKtJREFUOE+VztEK\r
+        gzAQRNHp//+imiiVpiIiiIi11u5s8pyNC5d5OYQ8LjmU3nmSlx2O46eSa4V9j5hrhW2L/+BaYV0j5lph\r
+        WSLmWmGev4q5VpimiLlWGMdDMdcKwxAx1wohfBRzrVBVlWKuFeq6Vsy1EuwSdoLzCfYJe8H50DStYq6V\r
+        4C7hTnA+OPdUzLW6i/v0ci8v54P3L8VcK8Eh4SA4n+C34pJD2w5XaX9xMuf+td64xAAAAABJRU5ErkJg\r
+        gg==\r
 </value>\r
   </data>\r
   <data name="b0.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">\r
     <value>\r
-        iVBORw0KGgoAAAANSUhEUgAAAA4AAAAeCAYAAAAcni9KAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8\r
-        YQUAAAAJcEhZcwAAEa8AABGvAff9S4QAAADKSURBVDhPnc5pCsJgDIThuf8Zu7vVFhFRRFq3Sb4cINPA\r
-        y/x6IPhtPHw+2yTW9evSVgnLUqCtEl6v8qutEp7PAm2V8HgUaKuE+71AWyXcbm+Htkq4Xgu0VcLlUqCt\r
-        EuZ5dWirhGkq0FYJ47g4tFVCVVUObZVQ17VDWyXCJmBDmI+wDdgS5iPsAnaE+dA0vUNbJcIh4ECYD227\r
-        c2irRLgPuCfMR3gIeCDMR3gMeCTMh647ObRVIhwDjoT5CM8Bz4T5CCeH6qHv59+W/p0oMG24BjG/AAAA\r
-        AElFTkSuQmCC\r
+        iVBORw0KGgoAAAANSUhEUgAAAAsAAAAZCAYAAADnstS2AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8\r
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAKtJREFUOE+VztEK\r
+        gzAQRNHp//+imiiVpiIiiIi11u5s8pyNC5d5OYQ8LjmU3nmSlx2O46eSa4V9j5hrhW2L/+BaYV0j5lph\r
+        WSLmWmGev4q5VpimiLlWGMdDMdcKwxAx1wohfBRzrVBVlWKuFeq6Vsy1EuwSdoLzCfYJe8H50DStYq6V\r
+        4C7hTnA+OPdUzLW6i/v0ci8v54P3L8VcK8Eh4SA4n+C34pJD2w5XaX9xMuf+td64xAAAAABJRU5ErkJg\r
+        gg==\r
 </value>\r
   </data>\r
   <data name="b1.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">\r
     <value>\r
-        iVBORw0KGgoAAAANSUhEUgAAAA4AAAAeCAYAAAAcni9KAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8\r
-        YQUAAAAJcEhZcwAAEa8AABGvAff9S4QAAADKSURBVDhPnc5pCsJgDIThuf8Zu7vVFhFRRFq3Sb4cINPA\r
-        y/x6IPhtPHw+2yTW9evSVgnLUqCtEl6v8qutEp7PAm2V8HgUaKuE+71AWyXcbm+Htkq4Xgu0VcLlUqCt\r
-        EuZ5dWirhGkq0FYJ47g4tFVCVVUObZVQ17VDWyXCJmBDmI+wDdgS5iPsAnaE+dA0vUNbJcIh4ECYD227\r
-        c2irRLgPuCfMR3gIeCDMR3gMeCTMh647ObRVIhwDjoT5CM8Bz4T5CCeH6qHv59+W/p0oMG24BjG/AAAA\r
-        AElFTkSuQmCC\r
+        iVBORw0KGgoAAAANSUhEUgAAAAsAAAAZCAYAAADnstS2AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8\r
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAKtJREFUOE+VztEK\r
+        gzAQRNHp//+imiiVpiIiiIi11u5s8pyNC5d5OYQ8LjmU3nmSlx2O46eSa4V9j5hrhW2L/+BaYV0j5lph\r
+        WSLmWmGev4q5VpimiLlWGMdDMdcKwxAx1wohfBRzrVBVlWKuFeq6Vsy1EuwSdoLzCfYJe8H50DStYq6V\r
+        4C7hTnA+OPdUzLW6i/v0ci8v54P3L8VcK8Eh4SA4n+C34pJD2w5XaX9xMuf+td64xAAAAABJRU5ErkJg\r
+        gg==\r
 </value>\r
   </data>\r
 </root>
\ No newline at end of file