拡大処理をScalerクラスに分離する

[kancollesniffer/KancolleSniffer.git] / KancolleSniffer / View / BattleResultPanel.cs

diff --git a/KancolleSniffer/View/BattleResultPanel.cs b/KancolleSniffer/View/BattleResultPanel.cs
index 9b15679..4e421ef 100644 (file)
--- a/KancolleSniffer/View/BattleResultPanel.cs
+++ b/KancolleSniffer/View/BattleResultPanel.cs
@@ -253,8 +253,7 @@ namespace KancolleSniffer.View
                 var panel = _panelList[i];\r
                 if (panel.Visible)\r
                     continue;\r
-                panel.Location = new Point(AutoScrollPosition.X,\r
-                    (int)Round((int)panel.Tag * ShipLabel.ScaleFactor.Height) + AutoScrollPosition.Y);\r
+                panel.Location = Scaler.Move(AutoScrollPosition.X, AutoScrollPosition.Y, 0, (int)panel.Tag);\r
                 panel.Visible = true;\r
             }\r
             for (var i = lines; i < _panelList.Count; i++)\r
@@ -264,9 +263,7 @@ namespace KancolleSniffer.View
                 _enemyLabels[0][1].Location.X + _enemyLabels.Max(labels => labels[1].Size.Width) - 1); // 敵の名前の右端\r
             for (var i = 0; i < lines; i++)\r
                 _panelList[i].Width = panelWidth;\r
-            _informationPanel.Location = new Point(\r
-                (int)Round(0 * ShipLabel.ScaleFactor.Width) + AutoScrollPosition.X,\r
-                (int)Round(20 * ShipLabel.ScaleFactor.Height) + AutoScrollPosition.Y);\r
+            _informationPanel.Location = Scaler.Move(AutoScrollPosition.X, AutoScrollPosition.Y, 0, 20);\r
             _informationPanel.Visible = true;\r
             UpdateCellInfo(_cellInfo);\r
         }\r