MainShipLabelsにPanelを移してShipPanelsにする

diff --git a/KancolleSniffer/KancolleSniffer.csproj b/KancolleSniffer/KancolleSniffer.csproj
index fe17894..a971b14 100644 (file)
--- a/KancolleSniffer/KancolleSniffer.csproj
+++ b/KancolleSniffer/KancolleSniffer.csproj
@@ -203,7 +203,7 @@
     <Compile Include="View\MainWindow\RepairListForMain.cs">\r
       <SubType>Component</SubType>\r
     </Compile>\r
-    <Compile Include="View\MainWindow\MainShipLabels.cs" />\r
+    <Compile Include="View\MainWindow\ShipPanels.cs" />\r
     <Compile Include="Forms\ListForm.cs">\r
       <SubType>Form</SubType>\r
     </Compile>\r

diff --git a/KancolleSniffer/View/MainWindow/ShipInfoPanel.cs b/KancolleSniffer/View/MainWindow/ShipInfoPanel.cs
index ac4395f..c5c14b6 100644 (file)
--- a/KancolleSniffer/View/MainWindow/ShipInfoPanel.cs
+++ b/KancolleSniffer/View/MainWindow/ShipInfoPanel.cs
@@ -8,20 +8,6 @@ namespace KancolleSniffer.View.MainWindow
 {\r
     public class ShipInfoPanel : PanelWithToolTip, IUpdateTimers\r
     {\r
-        private readonly Panel _combinedFleet = new Panel\r
-        {\r
-            Location = new Point(0, 0),\r
-            Size = new Size(220, 113),\r
-            Visible = false\r
-        };\r
-\r
-        private readonly Panel _7Ships = new Panel\r
-        {\r
-            Location = new Point(0, 0),\r
-            Size = new Size(220, 113),\r
-            Visible = false\r
-        };\r
-\r
         private readonly BattleInfoPanel _battleInfo = new BattleInfoPanel\r
         {\r
             Location = new Point(59, 116),\r
@@ -74,7 +60,7 @@ namespace KancolleSniffer.View.MainWindow
             Location = new Point(186, 117)\r
         };\r
 \r
-        private readonly MainShipLabels _mainLabels = new MainShipLabels();\r
+        private readonly ShipPanels _shipPanels;\r
 \r
         private UpdateContext _context;\r
 \r
@@ -92,14 +78,9 @@ namespace KancolleSniffer.View.MainWindow
 \r
         public ShipInfoPanel()\r
         {\r
-            Controls.AddRange(new Control[] {Guide, _presetAkashiTimer, _combinedFleet, _7Ships});\r
+            Controls.AddRange(new Control[] {Guide, _presetAkashiTimer});\r
             BorderStyle = BorderStyle.FixedSingle;\r
-            _mainLabels.CreateAllShipLabels(new MainShipPanels\r
-            {\r
-                PanelShipInfo = this,\r
-                Panel7Ships = _7Ships,\r
-                PanelCombinedFleet = _combinedFleet\r
-            }, ShipClickHandler);\r
+            _shipPanels = new ShipPanels(this, ShipClickHandler);\r
             Controls.AddRange(new Control[]\r
             {\r
                 _battleInfo,\r
@@ -120,10 +101,10 @@ namespace KancolleSniffer.View.MainWindow
 \r
         public void ToggleHpPercent()\r
         {\r
-            _mainLabels.ToggleHpPercent();\r
+            _shipPanels.ToggleHpPercent();\r
         }\r
 \r
-        public bool ShowHpInPercent => _mainLabels.ShowHpInPercent;\r
+        public bool ShowHpInPercent => _shipPanels.ShowHpInPercent;\r
 \r
         private bool _inSortie;\r
 \r
@@ -164,8 +145,7 @@ namespace KancolleSniffer.View.MainWindow
         public new void Update()\r
         {\r
             var ships = Context.Sniffer.Fleets[CurrentFleet].ActualShips;\r
-            _7Ships.Visible = ships.Count == 7;\r
-            _mainLabels.SetShipLabels(ships);\r
+            _shipPanels.SetShipLabels(ships);\r
             ShowCombinedFleet();\r
             _presetAkashiTimer.Visible = Context.Config.UsePresetAkashi;\r
             UpdateAkashiTimer();\r
@@ -178,10 +158,9 @@ namespace KancolleSniffer.View.MainWindow
         {\r
             if (!Context.Sniffer.IsCombinedFleet)\r
                 CombinedFleet = false;\r
-            _combinedFleet.Visible = CombinedFleet;\r
             if (CombinedFleet)\r
             {\r
-                _mainLabels.SetCombinedShipLabels(Context.Sniffer.Fleets[0].ActualShips,\r
+                _shipPanels.SetCombinedShipLabels(Context.Sniffer.Fleets[0].ActualShips,\r
                     Context.Sniffer.Fleets[1].ActualShips);\r
             }\r
         }\r
@@ -264,7 +243,7 @@ namespace KancolleSniffer.View.MainWindow
         {\r
             if (Context.Config.UsePresetAkashi)\r
                 UpdatePresetAkashiTimer();\r
-            _mainLabels.SetAkashiTimer(Context.Sniffer.Fleets[CurrentFleet].ActualShips,\r
+            _shipPanels.SetAkashiTimer(Context.Sniffer.Fleets[CurrentFleet].ActualShips,\r
                 Context.Sniffer.AkashiTimer.GetTimers(CurrentFleet, Context.GetStep().Now));\r
         }\r
 \r

diff --git a/KancolleSniffer/View/MainWindow/MainShipLabels.cs b/KancolleSniffer/View/MainWindow/ShipPanels.cs
similarity index 84%
rename from KancolleSniffer/View/MainWindow/MainShipLabels.cs
rename to KancolleSniffer/View/MainWindow/ShipPanels.cs
index 8f1091a..58b849b 100644 (file)
--- a/KancolleSniffer/View/MainWindow/MainShipLabels.cs
+++ b/KancolleSniffer/View/MainWindow/ShipPanels.cs
@@ -20,41 +20,48 @@ using KancolleSniffer.Model;
 \r
 namespace KancolleSniffer.View.MainWindow\r
 {\r
-    public class MainShipPanels\r
+    public class ShipPanels\r
     {\r
-        public Control PanelShipInfo { get; set; }\r
-        public Control Panel7Ships { get; set; }\r
-        public Control PanelCombinedFleet { get; set; }\r
-    }\r
+        private const int Width = 220;\r
+\r
+        private readonly Panel _combined = new Panel\r
+        {\r
+            Location = new Point(0, 0),\r
+            Size = new Size(Width, 113),\r
+            Visible = false\r
+        };\r
+\r
+        private readonly Panel _7Ships = new Panel\r
+        {\r
+            Location = new Point(0, 0),\r
+            Size = new Size(Width, 113),\r
+            Visible = false\r
+        };\r
 \r
-    public class MainShipLabels\r
-    {\r
         private readonly ShipLabelLines _shipLines;\r
         private readonly ShipLabelLines _shipLines7;\r
         private readonly CombinedShipLines _combinedLines = new CombinedShipLines();\r
-        private readonly HpDisplay _hpDisplay = new HpDisplay();\r
+        private readonly HpToggle _hpToggle = new HpToggle();\r
 \r
-        public bool ShowHpInPercent => _hpDisplay.InPercent;\r
+        public bool ShowHpInPercent => _hpToggle.InPercent;\r
 \r
-        public MainShipLabels()\r
+        public ShipPanels(Control parent, EventHandler onClick)\r
         {\r
             _shipLines = new ShipLabelLines(ShipInfo.MemberCount, 16);\r
             _shipLines7 = new ShipLabelLines(7, 14);\r
-        }\r
+            parent.Controls.AddRange(new Control[]{_combined, _7Ships});\r
+            _shipLines.Create(parent, _hpToggle, onClick);\r
+            _shipLines7.Create(_7Ships, _hpToggle, onClick);\r
+            _combinedLines.Create(_combined, _hpToggle, onClick);\r
 \r
-        public void CreateAllShipLabels(MainShipPanels panels, EventHandler onClick)\r
-        {\r
-            _shipLines.Create(panels.PanelShipInfo, _hpDisplay, onClick);\r
-            _shipLines7.Create(panels.Panel7Ships, _hpDisplay, onClick);\r
-            _combinedLines.Create(panels.PanelCombinedFleet, _hpDisplay, onClick);\r
         }\r
 \r
         public void ToggleHpPercent()\r
         {\r
-            _hpDisplay.ToggleHpPercent();\r
+            _hpToggle.ToggleHpPercent();\r
         }\r
 \r
-        private class HpDisplay\r
+        private class HpToggle\r
         {\r
             private readonly List<ShipLabel.Hp> _labels = new List<ShipLabel.Hp>();\r
             public bool InPercent { get; private set; }\r
@@ -85,11 +92,22 @@ namespace KancolleSniffer.View.MainWindow
 \r
         public void SetShipLabels(IReadOnlyList<ShipStatus> ships)\r
         {\r
-            (ships.Count == 7 ? _shipLines7 : _shipLines).Set(ships);\r
+            _combined.Visible = false;\r
+            if (ships.Count == 7)\r
+            {\r
+                _7Ships.Visible = true;\r
+                _shipLines7.Set(ships);\r
+            }\r
+            else\r
+            {\r
+                _7Ships.Visible = false;\r
+                _shipLines.Set(ships);\r
+            }\r
         }\r
 \r
         public void SetCombinedShipLabels(IReadOnlyList<ShipStatus> first, IReadOnlyList<ShipStatus> second)\r
         {\r
+            _combined.Visible = true;\r
             _combinedLines.Set(first, second);\r
         }\r
 \r
@@ -114,11 +132,11 @@ namespace KancolleSniffer.View.MainWindow
                 _lineHeight = lineHeight;\r
             }\r
 \r
-            public void Create(Control parent, HpDisplay hpDisplay, EventHandler onClick)\r
+            public void Create(Control parent, HpToggle hpToggle, EventHandler onClick)\r
             {\r
                 parent.SuspendLayout();\r
                 _akashiTimerLabels.Create(parent);\r
-                CreateHeader(parent, hpDisplay);\r
+                CreateHeader(parent, hpToggle);\r
                 for (var i = 0; i < _shipLines.Length; i++)\r
                 {\r
 \r
@@ -135,12 +153,12 @@ namespace KancolleSniffer.View.MainWindow
                     labels.Arrange(parent, CustomColors.ColumnColors.DarkFirst(i));\r
                     labels.SetClickHandler(onClick);\r
                     labels.SetTag(i);\r
-                    hpDisplay.AddHpLabel(labels.Hp);\r
+                    hpToggle.AddHpLabel(labels.Hp);\r
                 }\r
                 parent.ResumeLayout();\r
             }\r
 \r
-            private void CreateHeader(Control parent, HpDisplay hpDisplay)\r
+            private void CreateHeader(Control parent, HpToggle hpToggle)\r
             {\r
                 var headings = new Control[]\r
                 {\r
@@ -157,7 +175,7 @@ namespace KancolleSniffer.View.MainWindow
                     control.BackColor = CustomColors.ColumnColors.Bright;\r
                 }\r
                 headings[0].Cursor = Cursors.Hand;\r
-                hpDisplay.SetClickHandler(headings[0]);\r
+                hpToggle.SetClickHandler(headings[0]);\r
             }\r
 \r
             public void Set(IReadOnlyList<ShipStatus> ships)\r
@@ -277,10 +295,10 @@ namespace KancolleSniffer.View.MainWindow
             private const int LineHeight = 16;\r
             private const int ParentWidth = 220; // parent.Widthを使うとDPIスケーリング時に計算がくるうので\r
 \r
-            public void Create(Control parent, HpDisplay hpDisplay, EventHandler onClick)\r
+            public void Create(Control parent, HpToggle hpToggle, EventHandler onClick)\r
             {\r
                 parent.SuspendLayout();\r
-                CreateHeader(parent, hpDisplay);\r
+                CreateHeader(parent, hpToggle);\r
                 for (var i = 0; i < _combinedLines.Length; i++)\r
                 {\r
                     var x = ParentWidth / 2 * (i / ShipInfo.MemberCount);\r
@@ -296,12 +314,12 @@ namespace KancolleSniffer.View.MainWindow
                     labels.SetClickHandler(onClick);\r
                     labels.SetTag(i);\r
                     var hpLabel = _combinedLines[i].Hp;\r
-                    hpDisplay.AddHpLabel(hpLabel);\r
+                    hpToggle.AddHpLabel(hpLabel);\r
                 }\r
                 parent.ResumeLayout();\r
             }\r
 \r
-            private void CreateHeader(Control parent, HpDisplay hpDisplay)\r
+            private void CreateHeader(Control parent, HpToggle hpToggle)\r
             {\r
                 var headings = new Control[]\r
                 {\r
@@ -318,8 +336,8 @@ namespace KancolleSniffer.View.MainWindow
                     control.BackColor = CustomColors.ColumnColors.Bright;\r
                 }\r
                 headings[0].Cursor = headings[2].Cursor = Cursors.Hand;\r
-                hpDisplay.SetClickHandler(headings[0]);\r
-                hpDisplay.SetClickHandler(headings[2]);\r
+                hpToggle.SetClickHandler(headings[0]);\r
+                hpToggle.SetClickHandler(headings[2]);\r
             }\r
 \r
             public void Set(IReadOnlyList<ShipStatus> first, IReadOnlyList<ShipStatus> second)\r