DPIに応じて正しくスケールしないのを直す

diff --git a/KancolleSniffer/View/ControlsArranger.cs b/KancolleSniffer/View/ControlsArranger.cs
index 09f0919..58063c6 100644 (file)
--- a/KancolleSniffer/View/ControlsArranger.cs
+++ b/KancolleSniffer/View/ControlsArranger.cs
@@ -27,7 +27,6 @@ namespace KancolleSniffer.View
         public void Arrange(Control parent)\r
         {\r
             SetParent(parent);\r
-            Scale();\r
         }\r
 \r
         public void Arrange(Control parent, Color color)\r
@@ -45,7 +44,6 @@ namespace KancolleSniffer.View
         {\r
             parent.Controls.Add(BackPanel);\r
             BackPanel.BackColor = color;\r
-            Scaler.Scale(BackPanel);\r
         }\r
 \r
         private void SetParent(Control parent)\r
@@ -53,8 +51,13 @@ namespace KancolleSniffer.View
             parent.Controls.AddRange(Controls);\r
         }\r
 \r
-        private void Scale()\r
+        public void Scale()\r
         {\r
+            if (BackPanel != null)\r
+            {\r
+                Scaler.Scale(BackPanel);\r
+                return;\r
+            }\r
             foreach (var control in Controls)\r
                 Scaler.Scale(control);\r
         }\r

diff --git a/KancolleSniffer/View/MainWindow/QuestPanel.cs b/KancolleSniffer/View/MainWindow/QuestPanel.cs
index 8a7a80d..e012eb5 100644 (file)
--- a/KancolleSniffer/View/MainWindow/QuestPanel.cs
+++ b/KancolleSniffer/View/MainWindow/QuestPanel.cs
@@ -78,6 +78,7 @@ namespace KancolleSniffer.View.MainWindow
                     }\r
                 };\r
                 _labels[i].Arrange(this);\r
+                _labels[i].Scale();\r
             }\r
             ResumeLayout();\r
             SetupListScroller();\r

diff --git a/KancolleSniffer/View/MainWindow/ShipPanels.cs b/KancolleSniffer/View/MainWindow/ShipPanels.cs
index 42d950b..f7740eb 100644 (file)
--- a/KancolleSniffer/View/MainWindow/ShipPanels.cs
+++ b/KancolleSniffer/View/MainWindow/ShipPanels.cs
@@ -49,11 +49,10 @@ namespace KancolleSniffer.View.MainWindow
         {\r
             _shipLines = new ShipLabelLines(ShipInfo.MemberCount, 16);\r
             _shipLines7 = new ShipLabelLines(7, 14);\r
-            parent.Controls.AddRange(new Control[]{_combined, _7Ships});\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
         }\r
 \r
         public void ToggleHpPercent()\r
@@ -139,7 +138,6 @@ namespace KancolleSniffer.View.MainWindow
                 CreateHeader(parent, hpToggle);\r
                 for (var i = 0; i < _shipLines.Length; i++)\r
                 {\r
-\r
                     var y = Top + _lineHeight * (i + 1);\r
                     var labels = _shipLines[i] = new ShipLabels\r
                     {\r
@@ -170,10 +168,7 @@ namespace KancolleSniffer.View.MainWindow
                 };\r
                 parent.Controls.AddRange(headings);\r
                 foreach (var control in headings)\r
-                {\r
-                    Scaler.Scale(control);\r
                     control.BackColor = CustomColors.ColumnColors.Bright;\r
-                }\r
                 headings[0].Cursor = Cursors.Hand;\r
                 hpToggle.SetClickHandler(headings[0]);\r
             }\r

diff --git a/KancolleSniffer/View/ShipListPanel/GroupConfigLabels.cs b/KancolleSniffer/View/ShipListPanel/GroupConfigLabels.cs
index a135c6c..d135517 100644 (file)
--- a/KancolleSniffer/View/ShipListPanel/GroupConfigLabels.cs
+++ b/KancolleSniffer/View/ShipListPanel/GroupConfigLabels.cs
@@ -64,7 +64,6 @@ namespace KancolleSniffer.View.ShipListPanel
                     Size = new Size(12, 11),\r
                     Tag = i * 10 + j\r
                 };\r
-                Scaler.Scale(cb[j]);\r
                 cb[j].CheckedChanged += checkboxGroup_CheckedChanged;\r
             }\r
             SetAnchorRight(cb.Concat(new Control[] {labels.Level}).ToArray());\r
@@ -72,6 +71,7 @@ namespace KancolleSniffer.View.ShipListPanel
             _checkBoxesList.Add(cb);\r
             labels.Arrange(_shipListPanel, CustomColors.ColumnColors.BrightFirst(i));\r
             labels.BackPanel.Controls.AddRange(cb);\r
+            labels.Scale();\r
         }\r
 \r
         private void SetAnchorRight(params Control[] controls)\r

diff --git a/KancolleSniffer/View/ShipListPanel/RepairListLabels.cs b/KancolleSniffer/View/ShipListPanel/RepairListLabels.cs
index 810663a..92ef4fc 100644 (file)
--- a/KancolleSniffer/View/ShipListPanel/RepairListLabels.cs
+++ b/KancolleSniffer/View/ShipListPanel/RepairListLabels.cs
@@ -66,6 +66,7 @@ namespace KancolleSniffer.View.ShipListPanel
             SetAnchorRight(labels.Hp, labels.Level, labels.Time, labels.PerHp);\r
             _labelList.Add(labels);\r
             labels.Arrange(_shipListPanel, CustomColors.ColumnColors.BrightFirst(i));\r
+            labels.Scale();\r
             _shipListPanel.SetHpPercent(labels.Hp);\r
         }\r
 \r

diff --git a/KancolleSniffer/View/ShipListPanel/ShipListLabels.cs b/KancolleSniffer/View/ShipListPanel/ShipListLabels.cs
index 9fbd66b..8f1aa9b 100644 (file)
--- a/KancolleSniffer/View/ShipListPanel/ShipListLabels.cs
+++ b/KancolleSniffer/View/ShipListPanel/ShipListLabels.cs
@@ -51,6 +51,7 @@ namespace KancolleSniffer.View.ShipListPanel
             SetAnchorRight(labels.Hp, labels.Cond, labels.Level, labels.Exp);\r
             _labelList.Add(labels);\r
             labels.Arrange(_shipListPanel, CustomColors.ColumnColors.BrightFirst(i));\r
+            labels.Scale();\r
             _shipListPanel.SetHpPercent(labels.Hp);\r
         }\r
 \r