ズームしたときに文字が欠けないようにゆとりを持たせる

diff --git a/KancolleSniffer/AirBattleResultPanel.cs b/KancolleSniffer/AirBattleResultPanel.cs
index 6dc8d46..0d4871c 100644 (file)
--- a/KancolleSniffer/AirBattleResultPanel.cs
+++ b/KancolleSniffer/AirBattleResultPanel.cs
@@ -71,7 +71,7 @@ namespace KancolleSniffer
                 new Label {Text = "敵軍", Location = new Point(124, 6), AutoSize = true}\r
             };\r
             Controls.AddRange(labels);\r
-            const int left = 54;\r
+            const int left = 53;\r
             for (var stage = 0; stage < 2; stage++)\r
             {\r
                 _resultLabels[stage] = new Label[2][];\r
@@ -81,19 +81,19 @@ namespace KancolleSniffer
                     Controls.Add(_resultLabels[stage][fe][1] = new Label\r
                     {\r
                         Location = new Point(left + 32 + 57 * fe, top + 14 * stage),\r
-                        Size = new Size(23, 12),\r
+                        Size = new Size(24, 12),\r
                         TextAlign = ContentAlignment.TopLeft\r
                     });\r
                     Controls.Add(new Label\r
                     {\r
-                        Location = new Point(left + 20 + 57 * fe, top + 14 * stage),\r
+                        Location = new Point(left + 21 + 57 * fe, top + 14 * stage),\r
                         Text = "→",\r
                         AutoSize = true\r
                     });\r
                     Controls.Add(_resultLabels[stage][fe][0] = new Label\r
                     {\r
                         Location = new Point(left + 57 * fe, top + 14 * stage),\r
-                        Size = new Size(23, 12),\r
+                        Size = new Size(24, 12),\r
                         TextAlign = ContentAlignment.TopRight\r
                     });\r
                 }\r

diff --git a/KancolleSniffer/MainForm.Designer.cs b/KancolleSniffer/MainForm.Designer.cs
index 870087e..2d7290e 100644 (file)
--- a/KancolleSniffer/MainForm.Designer.cs
+++ b/KancolleSniffer/MainForm.Designer.cs
@@ -228,9 +228,9 @@ namespace KancolleSniffer
             // \r
             // labelAchievement\r
             // \r
-            this.labelAchievement.Location = new System.Drawing.Point(167, 18);\r
+            this.labelAchievement.Location = new System.Drawing.Point(166, 18);\r
             this.labelAchievement.Name = "labelAchievement";\r
-            this.labelAchievement.Size = new System.Drawing.Size(32, 12);\r
+            this.labelAchievement.Size = new System.Drawing.Size(33, 12);\r
             this.labelAchievement.TabIndex = 7;\r
             this.labelAchievement.TextAlign = System.Drawing.ContentAlignment.MiddleRight;\r
             // \r
@@ -245,9 +245,9 @@ namespace KancolleSniffer
             // \r
             // labelNumOfBuckets\r
             // \r
-            this.labelNumOfBuckets.Location = new System.Drawing.Point(117, 18);\r
+            this.labelNumOfBuckets.Location = new System.Drawing.Point(116, 18);\r
             this.labelNumOfBuckets.Name = "labelNumOfBuckets";\r
-            this.labelNumOfBuckets.Size = new System.Drawing.Size(29, 12);\r
+            this.labelNumOfBuckets.Size = new System.Drawing.Size(30, 12);\r
             this.labelNumOfBuckets.TabIndex = 5;\r
             this.labelNumOfBuckets.Text = "0";\r
             this.labelNumOfBuckets.TextAlign = System.Drawing.ContentAlignment.MiddleRight;\r
@@ -264,9 +264,9 @@ namespace KancolleSniffer
             // \r
             // labelNumOfEquips\r
             // \r
-            this.labelNumOfEquips.Location = new System.Drawing.Point(47, 18);\r
+            this.labelNumOfEquips.Location = new System.Drawing.Point(46, 18);\r
             this.labelNumOfEquips.Name = "labelNumOfEquips";\r
-            this.labelNumOfEquips.Size = new System.Drawing.Size(59, 12);\r
+            this.labelNumOfEquips.Size = new System.Drawing.Size(60, 12);\r
             this.labelNumOfEquips.TabIndex = 3;\r
             this.labelNumOfEquips.Text = "0/0";\r
             this.labelNumOfEquips.TextAlign = System.Drawing.ContentAlignment.MiddleRight;\r
@@ -282,9 +282,9 @@ namespace KancolleSniffer
             // \r
             // labelNumOfShips\r
             // \r
-            this.labelNumOfShips.Location = new System.Drawing.Point(1, 18);\r
+            this.labelNumOfShips.Location = new System.Drawing.Point(0, 18);\r
             this.labelNumOfShips.Name = "labelNumOfShips";\r
-            this.labelNumOfShips.Size = new System.Drawing.Size(47, 12);\r
+            this.labelNumOfShips.Size = new System.Drawing.Size(48, 12);\r
             this.labelNumOfShips.TabIndex = 1;\r
             this.labelNumOfShips.Text = "0/0";\r
             this.labelNumOfShips.TextAlign = System.Drawing.ContentAlignment.MiddleRight;\r
@@ -381,16 +381,16 @@ namespace KancolleSniffer
             // \r
             this.labelResultRank.Location = new System.Drawing.Point(1, 1);\r
             this.labelResultRank.Name = "labelResultRank";\r
-            this.labelResultRank.Size = new System.Drawing.Size(41, 12);\r
+            this.labelResultRank.Size = new System.Drawing.Size(42, 12);\r
             this.labelResultRank.TabIndex = 0;\r
             this.labelResultRank.Text = "判定";\r
             this.labelResultRank.Click += new System.EventHandler(this.labelResultRank_Click);\r
             // \r
             // labelLoS\r
             // \r
-            this.labelLoS.Location = new System.Drawing.Point(86, 117);\r
+            this.labelLoS.Location = new System.Drawing.Point(85, 117);\r
             this.labelLoS.Name = "labelLoS";\r
-            this.labelLoS.Size = new System.Drawing.Size(37, 12);\r
+            this.labelLoS.Size = new System.Drawing.Size(38, 12);\r
             this.labelLoS.TabIndex = 42;\r
             this.labelLoS.Text = "0.0";\r
             this.labelLoS.TextAlign = System.Drawing.ContentAlignment.MiddleRight;\r
@@ -462,9 +462,9 @@ namespace KancolleSniffer
             // \r
             // labelBouxiteHistory\r
             // \r
-            this.labelBouxiteHistory.Location = new System.Drawing.Point(118, 2);\r
+            this.labelBouxiteHistory.Location = new System.Drawing.Point(117, 2);\r
             this.labelBouxiteHistory.Name = "labelBouxiteHistory";\r
-            this.labelBouxiteHistory.Size = new System.Drawing.Size(41, 48);\r
+            this.labelBouxiteHistory.Size = new System.Drawing.Size(42, 48);\r
             this.labelBouxiteHistory.TabIndex = 7;\r
             this.labelBouxiteHistory.Text = "ボーキ";\r
             this.labelBouxiteHistory.TextAlign = System.Drawing.ContentAlignment.TopRight;\r
@@ -472,9 +472,9 @@ namespace KancolleSniffer
             // \r
             // labelSteelHistory\r
             // \r
-            this.labelSteelHistory.Location = new System.Drawing.Point(79, 2);\r
+            this.labelSteelHistory.Location = new System.Drawing.Point(78, 2);\r
             this.labelSteelHistory.Name = "labelSteelHistory";\r
-            this.labelSteelHistory.Size = new System.Drawing.Size(41, 48);\r
+            this.labelSteelHistory.Size = new System.Drawing.Size(42, 48);\r
             this.labelSteelHistory.TabIndex = 6;\r
             this.labelSteelHistory.Text = "鋼材";\r
             this.labelSteelHistory.TextAlign = System.Drawing.ContentAlignment.TopRight;\r
@@ -482,9 +482,9 @@ namespace KancolleSniffer
             // \r
             // labelBulletHistory\r
             // \r
-            this.labelBulletHistory.Location = new System.Drawing.Point(40, 2);\r
+            this.labelBulletHistory.Location = new System.Drawing.Point(39, 2);\r
             this.labelBulletHistory.Name = "labelBulletHistory";\r
-            this.labelBulletHistory.Size = new System.Drawing.Size(41, 48);\r
+            this.labelBulletHistory.Size = new System.Drawing.Size(42, 48);\r
             this.labelBulletHistory.TabIndex = 5;\r
             this.labelBulletHistory.Text = "弾薬";\r
             this.labelBulletHistory.TextAlign = System.Drawing.ContentAlignment.TopRight;\r
@@ -502,9 +502,9 @@ namespace KancolleSniffer
             // \r
             // labelFuelHistory\r
             // \r
-            this.labelFuelHistory.Location = new System.Drawing.Point(1, 2);\r
+            this.labelFuelHistory.Location = new System.Drawing.Point(0, 2);\r
             this.labelFuelHistory.Name = "labelFuelHistory";\r
-            this.labelFuelHistory.Size = new System.Drawing.Size(41, 48);\r
+            this.labelFuelHistory.Size = new System.Drawing.Size(42, 48);\r
             this.labelFuelHistory.TabIndex = 0;\r
             this.labelFuelHistory.Text = "燃料";\r
             this.labelFuelHistory.TextAlign = System.Drawing.ContentAlignment.TopRight;\r

diff --git a/KancolleSniffer/ShipLabels.cs b/KancolleSniffer/ShipLabels.cs
index e16d14b..ceb7371 100644 (file)
--- a/KancolleSniffer/ShipLabels.cs
+++ b/KancolleSniffer/ShipLabels.cs
@@ -69,20 +69,20 @@ namespace KancolleSniffer
                     new ShipLabel {Location = new Point(129, y), AutoSize = true, AnchorRight = true},\r
                     new ShipLabel\r
                     {\r
-                        Location = new Point(132, y),\r
-                        Size = new Size(23, height),\r
+                        Location = new Point(131, y),\r
+                        Size = new Size(24, height),\r
                         TextAlign = ContentAlignment.MiddleRight\r
                     },\r
                     new ShipLabel\r
                     {\r
-                        Location = new Point(157, y),\r
-                        Size = new Size(23, height),\r
+                        Location = new Point(156, y),\r
+                        Size = new Size(24, height),\r
                         TextAlign = ContentAlignment.MiddleRight\r
                     },\r
                     new ShipLabel\r
                     {\r
-                        Location = new Point(177, y),\r
-                        Size = new Size(41, height),\r
+                        Location = new Point(176, y),\r
+                        Size = new Size(42, height),\r
                         TextAlign = ContentAlignment.MiddleRight\r
                     },\r
                     new ShipLabel {Location = new Point(2, y), AutoSize = true}, // 名前のZ-orderを下に\r
@@ -150,8 +150,8 @@ namespace KancolleSniffer
                     new ShipLabel {Location = new Point(x + 88, y), AutoSize = true, AnchorRight = true},\r
                     new ShipLabel\r
                     {\r
-                        Location = new Point(x + 86, y),\r
-                        Size = new Size(23, height),\r
+                        Location = new Point(x + 85, y),\r
+                        Size = new Size(24, height),\r
                         TextAlign = ContentAlignment.MiddleRight\r
                     },\r
                     new ShipLabel {Location = new Point(x + 2, y), AutoSize = true}, // 名前のZ-orderを下に\r
@@ -217,7 +217,7 @@ namespace KancolleSniffer
         public void AdjustAkashiTimers()\r
         {\r
             var scale = ShipLabel.ScaleFactor;\r
-            if (scale.Height < 1.2 || scale.Height > 1.3)\r
+            if (scale.Height < 1.2)\r
                 return;\r
             for (var i = 0; i < _akashiTimers.Length; i++)\r
             {\r

diff --git a/KancolleSniffer/ShipListPanel.cs b/KancolleSniffer/ShipListPanel.cs
index d924c7e..017c71c 100644 (file)
--- a/KancolleSniffer/ShipListPanel.cs
+++ b/KancolleSniffer/ShipListPanel.cs
@@ -241,8 +241,8 @@ namespace KancolleSniffer
             {\r
                 new ShipLabel\r
                 {\r
-                    Location = new Point(91, 2),\r
-                    Size = new Size(23, LabelHeight),\r
+                    Location = new Point(90, 2),\r
+                    Size = new Size(24, LabelHeight),\r
                     TextAlign = ContentAlignment.MiddleRight\r
                 },\r
                 new ShipLabel {Location = new Point(10, 2), AutoSize = true},\r
@@ -310,8 +310,8 @@ namespace KancolleSniffer
                 new ShipLabel {Location = new Point(118, 2), AutoSize = true, AnchorRight = true},\r
                 new ShipLabel\r
                 {\r
-                    Location = new Point(117, 2),\r
-                    Size = new Size(23, height),\r
+                    Location = new Point(116, 2),\r
+                    Size = new Size(24, height),\r
                     TextAlign = ContentAlignment.MiddleRight\r
                 },\r
                 new ShipLabel {Location = new Point(141, 2), AutoSize = true},\r
@@ -348,20 +348,20 @@ namespace KancolleSniffer
                 new ShipLabel {Location = new Point(126, 2), AutoSize = true, AnchorRight = true},\r
                 new ShipLabel\r
                 {\r
-                    Location = new Point(129, 2),\r
-                    Size = new Size(23, height),\r
+                    Location = new Point(128, 2),\r
+                    Size = new Size(24, height),\r
                     TextAlign = ContentAlignment.MiddleRight\r
                 },\r
                 new ShipLabel\r
                 {\r
-                    Location = new Point(155, 2),\r
-                    Size = new Size(23, height),\r
+                    Location = new Point(154, 2),\r
+                    Size = new Size(24, height),\r
                     TextAlign = ContentAlignment.MiddleRight\r
                 },\r
                 new ShipLabel\r
                 {\r
-                    Location = new Point(176, 2),\r
-                    Size = new Size(41, height),\r
+                    Location = new Point(175, 2),\r
+                    Size = new Size(42, height),\r
                     TextAlign = ContentAlignment.MiddleRight\r
                 },\r
                 new ShipLabel {Location = new Point(10, 2), AutoSize = true},\r