PresetColorを廃止する

diff --git a/KancolleSniffer/View/AntiAirPanel.cs b/KancolleSniffer/View/AntiAirPanel.cs
index 1041d78..4a7f2ac 100644 (file)
--- a/KancolleSniffer/View/AntiAirPanel.cs
+++ b/KancolleSniffer/View/AntiAirPanel.cs
@@ -114,8 +114,7 @@ namespace KancolleSniffer.View
             foreach (var label in labels)\r
             {\r
                 Scaler.Scale(label);\r
-                label.PresetColor =\r
-                    label.BackColor = ShipLabel.ColumnColors[(i + 1) % 2];\r
+                label.BackColor = ShipLabel.ColumnColors[(i + 1) % 2];\r
             }\r
         }\r
 \r

diff --git a/KancolleSniffer/View/BattleResultPanel.cs b/KancolleSniffer/View/BattleResultPanel.cs
index 3fc5898..47531b1 100644 (file)
--- a/KancolleSniffer/View/BattleResultPanel.cs
+++ b/KancolleSniffer/View/BattleResultPanel.cs
@@ -373,7 +373,7 @@ namespace KancolleSniffer.View
                 foreach (var label in friend.Concat(enemy))\r
                 {\r
                     panel.Controls.Add(label);\r
-                    label.BackColor = label.PresetColor = ShipLabel.ColumnColors[i % 2];\r
+                    label.BackColor = ShipLabel.ColumnColors[i % 2];\r
                 }\r
                 Controls.Add(panel);\r
             }\r

diff --git a/KancolleSniffer/View/FleetPanel.cs b/KancolleSniffer/View/FleetPanel.cs
index 912f88c..55fafd3 100644 (file)
--- a/KancolleSniffer/View/FleetPanel.cs
+++ b/KancolleSniffer/View/FleetPanel.cs
@@ -320,8 +320,7 @@ namespace KancolleSniffer.View
             foreach (var label in labels)\r
             {\r
                 Scaler.Scale(label);\r
-                label.PresetColor =\r
-                    label.BackColor = ShipLabel.ColumnColors[(i + 1) % 2];\r
+                label.BackColor = ShipLabel.ColumnColors[(i + 1) % 2];\r
             }\r
         }\r
 \r

diff --git a/KancolleSniffer/View/MainFormLabels.cs b/KancolleSniffer/View/MainFormLabels.cs
index 81983e1..ca7c8a1 100644 (file)
--- a/KancolleSniffer/View/MainFormLabels.cs
+++ b/KancolleSniffer/View/MainFormLabels.cs
@@ -145,7 +145,7 @@ namespace KancolleSniffer.View
                 foreach (var label in shipLabels[i])\r
                 {\r
                     Scaler.Scale(label);\r
-                    label.PresetColor = label.BackColor = ShipLabel.ColumnColors[i % 2];\r
+                    label.BackColor = ShipLabel.ColumnColors[i % 2];\r
                     label.Tag = i;\r
                     label.Click += onClick;\r
                 }\r
@@ -235,7 +235,7 @@ namespace KancolleSniffer.View
                 foreach (var label in _combinedLabels[i])\r
                 {\r
                     Scaler.Scale(label);\r
-                    label.PresetColor = label.BackColor = ShipLabel.ColumnColors[i % 2];\r
+                    label.BackColor = ShipLabel.ColumnColors[i % 2];\r
                     label.Tag = i;\r
                     label.Click += onClick;\r
                 }\r

diff --git a/KancolleSniffer/View/RepairListForMain.cs b/KancolleSniffer/View/RepairListForMain.cs
index 070bfde..8c50e6d 100644 (file)
--- a/KancolleSniffer/View/RepairListForMain.cs
+++ b/KancolleSniffer/View/RepairListForMain.cs
@@ -65,7 +65,7 @@ namespace KancolleSniffer.View
                 foreach (var label in _repairLabels[i].Labels)\r
                 {\r
                     Scaler.Scale(label);\r
-                    label.PresetColor = label.BackColor = ShipLabel.ColumnColors[(i + 1) % 2];\r
+                    label.BackColor = ShipLabel.ColumnColors[(i + 1) % 2];\r
                     label.Click += onClick;\r
                 }\r
             }\r
@@ -137,7 +137,7 @@ namespace KancolleSniffer.View
             labels.Fleet.Text = "";\r
             labels.Name.SetName("");\r
             labels.Time.Text = "";\r
-            labels.Damage.BackColor = labels.Damage.PresetColor;\r
+            labels.Damage.BackColor = ShipLabel.ColumnColors[(i + 1) % 2];\r
         }\r
     }\r
 }
\ No newline at end of file

diff --git a/KancolleSniffer/View/ShipLabel.cs b/KancolleSniffer/View/ShipLabel.cs
index 9a2b9aa..b9a0f2a 100644 (file)
--- a/KancolleSniffer/View/ShipLabel.cs
+++ b/KancolleSniffer/View/ShipLabel.cs
@@ -28,8 +28,8 @@ namespace KancolleSniffer.View
     {\r
         public static Color[] ColumnColors = {SystemColors.Control, Color.White};\r
         public static Font LatinFont { get; set; } = new Font("Tahoma", 8f);\r
-        public Color PresetColor { get; set; }\r
         public bool AnchorRight { get; set; }\r
+        private Color _initialBackColor;\r
         private int _right = Int32.MinValue;\r
         private int _left;\r
         private SlotStatus _slotStatus;\r
@@ -45,7 +45,12 @@ namespace KancolleSniffer.View
         public override Color BackColor\r
         {\r
             get => base.BackColor;\r
-            set => base.BackColor = value == DefaultBackColor ? PresetColor : value;\r
+            set\r
+            {\r
+                if (_initialBackColor == Color.Empty)\r
+                    _initialBackColor = value;\r
+                base.BackColor = value;\r
+            }\r
         }\r
 \r
         [Flags]\r
@@ -150,7 +155,7 @@ namespace KancolleSniffer.View
             if (status == null)\r
             {\r
                 Text = "";\r
-                BackColor = PresetColor;\r
+                BackColor = _initialBackColor;\r
                 return;\r
             }\r
             if (_hpPercent)\r
@@ -221,7 +226,7 @@ namespace KancolleSniffer.View
                 case ShipStatus.Damage.Small:\r
                     return Color.FromArgb(240, 240, 0);\r
                 default:\r
-                    return PresetColor;\r
+                    return _initialBackColor;\r
             }\r
         }\r
 \r
@@ -230,7 +235,7 @@ namespace KancolleSniffer.View
             if (status == null)\r
             {\r
                 Text = "";\r
-                BackColor = PresetColor;\r
+                BackColor = _initialBackColor;\r
                 return;\r
             }\r
             var cond = status.Cond;\r
@@ -238,7 +243,7 @@ namespace KancolleSniffer.View
             BackColor = cond >= 50\r
                 ? CUDColors.Yellow\r
                 : cond >= 30\r
-                    ? PresetColor\r
+                    ? _initialBackColor\r
                     : cond >= 20\r
                         ? CUDColors.Orange\r
                         : CUDColors.Red;\r

diff --git a/KancolleSniffer/View/ShipListPanel/GroupConfigLabels.cs b/KancolleSniffer/View/ShipListPanel/GroupConfigLabels.cs
index eefd858..b502f12 100644 (file)
--- a/KancolleSniffer/View/ShipListPanel/GroupConfigLabels.cs
+++ b/KancolleSniffer/View/ShipListPanel/GroupConfigLabels.cs
@@ -85,8 +85,7 @@ namespace KancolleSniffer.View.ShipListPanel
             foreach (var label in labels)\r
             {\r
                 Scaler.Scale(label);\r
-                label.PresetColor =\r
-                    label.BackColor = ShipLabel.ColumnColors[(i + 1) % 2];\r
+                label.BackColor = ShipLabel.ColumnColors[(i + 1) % 2];\r
             }\r
         }\r
 \r

diff --git a/KancolleSniffer/View/ShipListPanel/RepairListLabels.cs b/KancolleSniffer/View/ShipListPanel/RepairListLabels.cs
index 6e7fae7..53a6d67 100644 (file)
--- a/KancolleSniffer/View/ShipListPanel/RepairListLabels.cs
+++ b/KancolleSniffer/View/ShipListPanel/RepairListLabels.cs
@@ -72,8 +72,7 @@ namespace KancolleSniffer.View.ShipListPanel
             foreach (var label in labels)\r
             {\r
                 Scaler.Scale(label);\r
-                label.PresetColor =\r
-                    label.BackColor = ShipLabel.ColumnColors[(i + 1) % 2];\r
+                label.BackColor = ShipLabel.ColumnColors[(i + 1) % 2];\r
             }\r
             _shipListPanel.SetHpPercent(labels[0]);\r
         }\r

diff --git a/KancolleSniffer/View/ShipListPanel/ShipListLabels.cs b/KancolleSniffer/View/ShipListPanel/ShipListLabels.cs
index 1f66baf..8bf004f 100644 (file)
--- a/KancolleSniffer/View/ShipListPanel/ShipListLabels.cs
+++ b/KancolleSniffer/View/ShipListPanel/ShipListLabels.cs
@@ -81,8 +81,7 @@ namespace KancolleSniffer.View.ShipListPanel
             foreach (var label in labels)\r
             {\r
                 Scaler.Scale(label);\r
-                label.PresetColor =\r
-                    label.BackColor = ShipLabel.ColumnColors[(i + 1) % 2];\r
+                label.BackColor = ShipLabel.ColumnColors[(i + 1) % 2];\r
             }\r
             _shipListPanel.SetHpPercent(labels[0]);\r
         }\r