From 2239ef207d5559e76b4262eb4015cde28ea63ced Mon Sep 17 00:00:00 2001 From: Kazuhiro Fujieda Date: Thu, 12 Oct 2017 23:38:05 +0900 Subject: [PATCH] =?utf8?q?=E3=82=BA=E3=83=BC=E3=83=A0=E3=81=97=E3=81=9F?= =?utf8?q?=E3=81=A8=E3=81=8D=E3=81=AB=E6=96=87=E5=AD=97=E3=81=8C=E6=AC=A0?= =?utf8?q?=E3=81=91=E3=81=AA=E3=81=84=E3=82=88=E3=81=86=E3=81=AB=E3=82=86?= =?utf8?q?=E3=81=A8=E3=82=8A=E3=82=92=E6=8C=81=E3=81=9F=E3=81=9B=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- KancolleSniffer/AirBattleResultPanel.cs | 8 +++---- KancolleSniffer/MainForm.Designer.cs | 38 ++++++++++++++++----------------- KancolleSniffer/ShipLabels.cs | 18 ++++++++-------- KancolleSniffer/ShipListPanel.cs | 20 ++++++++--------- 4 files changed, 42 insertions(+), 42 deletions(-) diff --git a/KancolleSniffer/AirBattleResultPanel.cs b/KancolleSniffer/AirBattleResultPanel.cs index 6dc8d46..0d4871c 100644 --- a/KancolleSniffer/AirBattleResultPanel.cs +++ b/KancolleSniffer/AirBattleResultPanel.cs @@ -71,7 +71,7 @@ namespace KancolleSniffer new Label {Text = "敵軍", Location = new Point(124, 6), AutoSize = true} }; Controls.AddRange(labels); - const int left = 54; + const int left = 53; for (var stage = 0; stage < 2; stage++) { _resultLabels[stage] = new Label[2][]; @@ -81,19 +81,19 @@ namespace KancolleSniffer Controls.Add(_resultLabels[stage][fe][1] = new Label { Location = new Point(left + 32 + 57 * fe, top + 14 * stage), - Size = new Size(23, 12), + Size = new Size(24, 12), TextAlign = ContentAlignment.TopLeft }); Controls.Add(new Label { - Location = new Point(left + 20 + 57 * fe, top + 14 * stage), + Location = new Point(left + 21 + 57 * fe, top + 14 * stage), Text = "→", AutoSize = true }); Controls.Add(_resultLabels[stage][fe][0] = new Label { Location = new Point(left + 57 * fe, top + 14 * stage), - Size = new Size(23, 12), + Size = new Size(24, 12), TextAlign = ContentAlignment.TopRight }); } diff --git a/KancolleSniffer/MainForm.Designer.cs b/KancolleSniffer/MainForm.Designer.cs index 870087e..2d7290e 100644 --- a/KancolleSniffer/MainForm.Designer.cs +++ b/KancolleSniffer/MainForm.Designer.cs @@ -228,9 +228,9 @@ namespace KancolleSniffer // // labelAchievement // - this.labelAchievement.Location = new System.Drawing.Point(167, 18); + this.labelAchievement.Location = new System.Drawing.Point(166, 18); this.labelAchievement.Name = "labelAchievement"; - this.labelAchievement.Size = new System.Drawing.Size(32, 12); + this.labelAchievement.Size = new System.Drawing.Size(33, 12); this.labelAchievement.TabIndex = 7; this.labelAchievement.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // @@ -245,9 +245,9 @@ namespace KancolleSniffer // // labelNumOfBuckets // - this.labelNumOfBuckets.Location = new System.Drawing.Point(117, 18); + this.labelNumOfBuckets.Location = new System.Drawing.Point(116, 18); this.labelNumOfBuckets.Name = "labelNumOfBuckets"; - this.labelNumOfBuckets.Size = new System.Drawing.Size(29, 12); + this.labelNumOfBuckets.Size = new System.Drawing.Size(30, 12); this.labelNumOfBuckets.TabIndex = 5; this.labelNumOfBuckets.Text = "0"; this.labelNumOfBuckets.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -264,9 +264,9 @@ namespace KancolleSniffer // // labelNumOfEquips // - this.labelNumOfEquips.Location = new System.Drawing.Point(47, 18); + this.labelNumOfEquips.Location = new System.Drawing.Point(46, 18); this.labelNumOfEquips.Name = "labelNumOfEquips"; - this.labelNumOfEquips.Size = new System.Drawing.Size(59, 12); + this.labelNumOfEquips.Size = new System.Drawing.Size(60, 12); this.labelNumOfEquips.TabIndex = 3; this.labelNumOfEquips.Text = "0/0"; this.labelNumOfEquips.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -282,9 +282,9 @@ namespace KancolleSniffer // // labelNumOfShips // - this.labelNumOfShips.Location = new System.Drawing.Point(1, 18); + this.labelNumOfShips.Location = new System.Drawing.Point(0, 18); this.labelNumOfShips.Name = "labelNumOfShips"; - this.labelNumOfShips.Size = new System.Drawing.Size(47, 12); + this.labelNumOfShips.Size = new System.Drawing.Size(48, 12); this.labelNumOfShips.TabIndex = 1; this.labelNumOfShips.Text = "0/0"; this.labelNumOfShips.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -381,16 +381,16 @@ namespace KancolleSniffer // this.labelResultRank.Location = new System.Drawing.Point(1, 1); this.labelResultRank.Name = "labelResultRank"; - this.labelResultRank.Size = new System.Drawing.Size(41, 12); + this.labelResultRank.Size = new System.Drawing.Size(42, 12); this.labelResultRank.TabIndex = 0; this.labelResultRank.Text = "判定"; this.labelResultRank.Click += new System.EventHandler(this.labelResultRank_Click); // // labelLoS // - this.labelLoS.Location = new System.Drawing.Point(86, 117); + this.labelLoS.Location = new System.Drawing.Point(85, 117); this.labelLoS.Name = "labelLoS"; - this.labelLoS.Size = new System.Drawing.Size(37, 12); + this.labelLoS.Size = new System.Drawing.Size(38, 12); this.labelLoS.TabIndex = 42; this.labelLoS.Text = "0.0"; this.labelLoS.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -462,9 +462,9 @@ namespace KancolleSniffer // // labelBouxiteHistory // - this.labelBouxiteHistory.Location = new System.Drawing.Point(118, 2); + this.labelBouxiteHistory.Location = new System.Drawing.Point(117, 2); this.labelBouxiteHistory.Name = "labelBouxiteHistory"; - this.labelBouxiteHistory.Size = new System.Drawing.Size(41, 48); + this.labelBouxiteHistory.Size = new System.Drawing.Size(42, 48); this.labelBouxiteHistory.TabIndex = 7; this.labelBouxiteHistory.Text = "ボーキ"; this.labelBouxiteHistory.TextAlign = System.Drawing.ContentAlignment.TopRight; @@ -472,9 +472,9 @@ namespace KancolleSniffer // // labelSteelHistory // - this.labelSteelHistory.Location = new System.Drawing.Point(79, 2); + this.labelSteelHistory.Location = new System.Drawing.Point(78, 2); this.labelSteelHistory.Name = "labelSteelHistory"; - this.labelSteelHistory.Size = new System.Drawing.Size(41, 48); + this.labelSteelHistory.Size = new System.Drawing.Size(42, 48); this.labelSteelHistory.TabIndex = 6; this.labelSteelHistory.Text = "鋼材"; this.labelSteelHistory.TextAlign = System.Drawing.ContentAlignment.TopRight; @@ -482,9 +482,9 @@ namespace KancolleSniffer // // labelBulletHistory // - this.labelBulletHistory.Location = new System.Drawing.Point(40, 2); + this.labelBulletHistory.Location = new System.Drawing.Point(39, 2); this.labelBulletHistory.Name = "labelBulletHistory"; - this.labelBulletHistory.Size = new System.Drawing.Size(41, 48); + this.labelBulletHistory.Size = new System.Drawing.Size(42, 48); this.labelBulletHistory.TabIndex = 5; this.labelBulletHistory.Text = "弾薬"; this.labelBulletHistory.TextAlign = System.Drawing.ContentAlignment.TopRight; @@ -502,9 +502,9 @@ namespace KancolleSniffer // // labelFuelHistory // - this.labelFuelHistory.Location = new System.Drawing.Point(1, 2); + this.labelFuelHistory.Location = new System.Drawing.Point(0, 2); this.labelFuelHistory.Name = "labelFuelHistory"; - this.labelFuelHistory.Size = new System.Drawing.Size(41, 48); + this.labelFuelHistory.Size = new System.Drawing.Size(42, 48); this.labelFuelHistory.TabIndex = 0; this.labelFuelHistory.Text = "燃料"; this.labelFuelHistory.TextAlign = System.Drawing.ContentAlignment.TopRight; diff --git a/KancolleSniffer/ShipLabels.cs b/KancolleSniffer/ShipLabels.cs index e16d14b..ceb7371 100644 --- 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}, new ShipLabel { - Location = new Point(132, y), - Size = new Size(23, height), + Location = new Point(131, y), + Size = new Size(24, height), TextAlign = ContentAlignment.MiddleRight }, new ShipLabel { - Location = new Point(157, y), - Size = new Size(23, height), + Location = new Point(156, y), + Size = new Size(24, height), TextAlign = ContentAlignment.MiddleRight }, new ShipLabel { - Location = new Point(177, y), - Size = new Size(41, height), + Location = new Point(176, y), + Size = new Size(42, height), TextAlign = ContentAlignment.MiddleRight }, new ShipLabel {Location = new Point(2, y), AutoSize = true}, // 名前のZ-orderを下に @@ -150,8 +150,8 @@ namespace KancolleSniffer new ShipLabel {Location = new Point(x + 88, y), AutoSize = true, AnchorRight = true}, new ShipLabel { - Location = new Point(x + 86, y), - Size = new Size(23, height), + Location = new Point(x + 85, y), + Size = new Size(24, height), TextAlign = ContentAlignment.MiddleRight }, new ShipLabel {Location = new Point(x + 2, y), AutoSize = true}, // 名前のZ-orderを下に @@ -217,7 +217,7 @@ namespace KancolleSniffer public void AdjustAkashiTimers() { var scale = ShipLabel.ScaleFactor; - if (scale.Height < 1.2 || scale.Height > 1.3) + if (scale.Height < 1.2) return; for (var i = 0; i < _akashiTimers.Length; i++) { diff --git a/KancolleSniffer/ShipListPanel.cs b/KancolleSniffer/ShipListPanel.cs index d924c7e..017c71c 100644 --- a/KancolleSniffer/ShipListPanel.cs +++ b/KancolleSniffer/ShipListPanel.cs @@ -241,8 +241,8 @@ namespace KancolleSniffer { new ShipLabel { - Location = new Point(91, 2), - Size = new Size(23, LabelHeight), + Location = new Point(90, 2), + Size = new Size(24, LabelHeight), TextAlign = ContentAlignment.MiddleRight }, new ShipLabel {Location = new Point(10, 2), AutoSize = true}, @@ -310,8 +310,8 @@ namespace KancolleSniffer new ShipLabel {Location = new Point(118, 2), AutoSize = true, AnchorRight = true}, new ShipLabel { - Location = new Point(117, 2), - Size = new Size(23, height), + Location = new Point(116, 2), + Size = new Size(24, height), TextAlign = ContentAlignment.MiddleRight }, new ShipLabel {Location = new Point(141, 2), AutoSize = true}, @@ -348,20 +348,20 @@ namespace KancolleSniffer new ShipLabel {Location = new Point(126, 2), AutoSize = true, AnchorRight = true}, new ShipLabel { - Location = new Point(129, 2), - Size = new Size(23, height), + Location = new Point(128, 2), + Size = new Size(24, height), TextAlign = ContentAlignment.MiddleRight }, new ShipLabel { - Location = new Point(155, 2), - Size = new Size(23, height), + Location = new Point(154, 2), + Size = new Size(24, height), TextAlign = ContentAlignment.MiddleRight }, new ShipLabel { - Location = new Point(176, 2), - Size = new Size(41, height), + Location = new Point(175, 2), + Size = new Size(42, height), TextAlign = ContentAlignment.MiddleRight }, new ShipLabel {Location = new Point(10, 2), AutoSize = true}, -- 2.11.0