OSDN Git Service
(root)
/
kancollesniffer
/
KancolleSniffer.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
e09057e
)
ズームしたときに文字が欠けないようにゆとりを持たせる
author
Kazuhiro Fujieda
<fujieda@users.osdn.me>
Thu, 12 Oct 2017 14:38:05 +0000
(23:38 +0900)
committer
Kazuhiro Fujieda
<fujieda@users.osdn.me>
Thu, 12 Oct 2017 14:47:20 +0000
(23:47 +0900)
KancolleSniffer/AirBattleResultPanel.cs
patch
|
blob
|
history
KancolleSniffer/MainForm.Designer.cs
patch
|
blob
|
history
KancolleSniffer/ShipLabels.cs
patch
|
blob
|
history
KancolleSniffer/ShipListPanel.cs
patch
|
blob
|
history
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
new Label {Text = "敵軍", Location = new Point(124, 6), AutoSize = true}
\r
};
\r
Controls.AddRange(labels);
\r
- const int left = 5
4
;
\r
+ const int left = 5
3
;
\r
for (var stage = 0; stage < 2; stage++)
\r
{
\r
_resultLabels[stage] = new Label[2][];
\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
Controls.Add(_resultLabels[stage][fe][1] = new Label
\r
{
\r
Location = new Point(left + 32 + 57 * fe, top + 14 * stage),
\r
- Size = new Size(2
3
, 12),
\r
+ Size = new Size(2
4
, 12),
\r
TextAlign = ContentAlignment.TopLeft
\r
});
\r
Controls.Add(new Label
\r
{
\r
TextAlign = ContentAlignment.TopLeft
\r
});
\r
Controls.Add(new Label
\r
{
\r
- Location = new Point(left + 2
0
+ 57 * fe, top + 14 * stage),
\r
+ Location = new Point(left + 2
1
+ 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
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(2
3
, 12),
\r
+ Size = new Size(2
4
, 12),
\r
TextAlign = ContentAlignment.TopRight
\r
});
\r
}
\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
//
\r
// labelAchievement
\r
//
\r
- this.labelAchievement.Location = new System.Drawing.Point(16
7
, 18);
\r
+ this.labelAchievement.Location = new System.Drawing.Point(16
6
, 18);
\r
this.labelAchievement.Name = "labelAchievement";
\r
this.labelAchievement.Name = "labelAchievement";
\r
- this.labelAchievement.Size = new System.Drawing.Size(3
2
, 12);
\r
+ this.labelAchievement.Size = new System.Drawing.Size(3
3
, 12);
\r
this.labelAchievement.TabIndex = 7;
\r
this.labelAchievement.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
\r
//
\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
//
\r
// labelNumOfBuckets
\r
//
\r
- this.labelNumOfBuckets.Location = new System.Drawing.Point(11
7
, 18);
\r
+ this.labelNumOfBuckets.Location = new System.Drawing.Point(11
6
, 18);
\r
this.labelNumOfBuckets.Name = "labelNumOfBuckets";
\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
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
//
\r
// labelNumOfEquips
\r
//
\r
- this.labelNumOfEquips.Location = new System.Drawing.Point(4
7
, 18);
\r
+ this.labelNumOfEquips.Location = new System.Drawing.Point(4
6
, 18);
\r
this.labelNumOfEquips.Name = "labelNumOfEquips";
\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
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
//
\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.Name = "labelNumOfShips";
\r
- this.labelNumOfShips.Size = new System.Drawing.Size(4
7
, 12);
\r
+ this.labelNumOfShips.Size = new System.Drawing.Size(4
8
, 12);
\r
this.labelNumOfShips.TabIndex = 1;
\r
this.labelNumOfShips.Text = "0/0";
\r
this.labelNumOfShips.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
\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
//
\r
this.labelResultRank.Location = new System.Drawing.Point(1, 1);
\r
this.labelResultRank.Name = "labelResultRank";
\r
- this.labelResultRank.Size = new System.Drawing.Size(4
1
, 12);
\r
+ this.labelResultRank.Size = new System.Drawing.Size(4
2
, 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.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(8
6
, 117);
\r
+ this.labelLoS.Location = new System.Drawing.Point(8
5
, 117);
\r
this.labelLoS.Name = "labelLoS";
\r
this.labelLoS.Name = "labelLoS";
\r
- this.labelLoS.Size = new System.Drawing.Size(3
7
, 12);
\r
+ this.labelLoS.Size = new System.Drawing.Size(3
8
, 12);
\r
this.labelLoS.TabIndex = 42;
\r
this.labelLoS.Text = "0.0";
\r
this.labelLoS.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
\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
//
\r
// labelBouxiteHistory
\r
//
\r
- this.labelBouxiteHistory.Location = new System.Drawing.Point(11
8
, 2);
\r
+ this.labelBouxiteHistory.Location = new System.Drawing.Point(11
7
, 2);
\r
this.labelBouxiteHistory.Name = "labelBouxiteHistory";
\r
this.labelBouxiteHistory.Name = "labelBouxiteHistory";
\r
- this.labelBouxiteHistory.Size = new System.Drawing.Size(4
1
, 48);
\r
+ this.labelBouxiteHistory.Size = new System.Drawing.Size(4
2
, 48);
\r
this.labelBouxiteHistory.TabIndex = 7;
\r
this.labelBouxiteHistory.Text = "ボーキ";
\r
this.labelBouxiteHistory.TextAlign = System.Drawing.ContentAlignment.TopRight;
\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
//
\r
// labelSteelHistory
\r
//
\r
- this.labelSteelHistory.Location = new System.Drawing.Point(7
9
, 2);
\r
+ this.labelSteelHistory.Location = new System.Drawing.Point(7
8
, 2);
\r
this.labelSteelHistory.Name = "labelSteelHistory";
\r
this.labelSteelHistory.Name = "labelSteelHistory";
\r
- this.labelSteelHistory.Size = new System.Drawing.Size(4
1
, 48);
\r
+ this.labelSteelHistory.Size = new System.Drawing.Size(4
2
, 48);
\r
this.labelSteelHistory.TabIndex = 6;
\r
this.labelSteelHistory.Text = "鋼材";
\r
this.labelSteelHistory.TextAlign = System.Drawing.ContentAlignment.TopRight;
\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
//
\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.Name = "labelBulletHistory";
\r
- this.labelBulletHistory.Size = new System.Drawing.Size(4
1
, 48);
\r
+ this.labelBulletHistory.Size = new System.Drawing.Size(4
2
, 48);
\r
this.labelBulletHistory.TabIndex = 5;
\r
this.labelBulletHistory.Text = "弾薬";
\r
this.labelBulletHistory.TextAlign = System.Drawing.ContentAlignment.TopRight;
\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
//
\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.Name = "labelFuelHistory";
\r
- this.labelFuelHistory.Size = new System.Drawing.Size(4
1
, 48);
\r
+ this.labelFuelHistory.Size = new System.Drawing.Size(4
2
, 48);
\r
this.labelFuelHistory.TabIndex = 0;
\r
this.labelFuelHistory.Text = "燃料";
\r
this.labelFuelHistory.TextAlign = System.Drawing.ContentAlignment.TopRight;
\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
new ShipLabel {Location = new Point(129, y), AutoSize = true, AnchorRight = true},
\r
new ShipLabel
\r
{
\r
- Location = new Point(13
2
, y),
\r
- Size = new Size(2
3
, height),
\r
+ Location = new Point(13
1
, y),
\r
+ Size = new Size(2
4
, height),
\r
TextAlign = ContentAlignment.MiddleRight
\r
},
\r
new ShipLabel
\r
{
\r
TextAlign = ContentAlignment.MiddleRight
\r
},
\r
new ShipLabel
\r
{
\r
- Location = new Point(15
7
, y),
\r
- Size = new Size(2
3
, height),
\r
+ Location = new Point(15
6
, y),
\r
+ Size = new Size(2
4
, height),
\r
TextAlign = ContentAlignment.MiddleRight
\r
},
\r
new ShipLabel
\r
{
\r
TextAlign = ContentAlignment.MiddleRight
\r
},
\r
new ShipLabel
\r
{
\r
- Location = new Point(17
7
, y),
\r
- Size = new Size(4
1
, height),
\r
+ Location = new Point(17
6
, y),
\r
+ Size = new Size(4
2
, height),
\r
TextAlign = ContentAlignment.MiddleRight
\r
},
\r
new ShipLabel {Location = new Point(2, y), AutoSize = true}, // 名前のZ-orderを下に
\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
new ShipLabel {Location = new Point(x + 88, y), AutoSize = true, AnchorRight = true},
\r
new ShipLabel
\r
{
\r
- Location = new Point(x + 8
6
, y),
\r
- Size = new Size(2
3
, height),
\r
+ Location = new Point(x + 8
5
, y),
\r
+ Size = new Size(2
4
, height),
\r
TextAlign = ContentAlignment.MiddleRight
\r
},
\r
new ShipLabel {Location = new Point(x + 2, y), AutoSize = true}, // 名前のZ-orderを下に
\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
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
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
{
\r
new ShipLabel
\r
{
\r
- Location = new Point(9
1
, 2),
\r
- Size = new Size(2
3
, LabelHeight),
\r
+ Location = new Point(9
0
, 2),
\r
+ Size = new Size(2
4
, LabelHeight),
\r
TextAlign = ContentAlignment.MiddleRight
\r
},
\r
new ShipLabel {Location = new Point(10, 2), AutoSize = true},
\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
new ShipLabel {Location = new Point(118, 2), AutoSize = true, AnchorRight = true},
\r
new ShipLabel
\r
{
\r
- Location = new Point(11
7
, 2),
\r
- Size = new Size(2
3
, height),
\r
+ Location = new Point(11
6
, 2),
\r
+ Size = new Size(2
4
, height),
\r
TextAlign = ContentAlignment.MiddleRight
\r
},
\r
new ShipLabel {Location = new Point(141, 2), AutoSize = true},
\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
new ShipLabel {Location = new Point(126, 2), AutoSize = true, AnchorRight = true},
\r
new ShipLabel
\r
{
\r
- Location = new Point(12
9
, 2),
\r
- Size = new Size(2
3
, height),
\r
+ Location = new Point(12
8
, 2),
\r
+ Size = new Size(2
4
, height),
\r
TextAlign = ContentAlignment.MiddleRight
\r
},
\r
new ShipLabel
\r
{
\r
TextAlign = ContentAlignment.MiddleRight
\r
},
\r
new ShipLabel
\r
{
\r
- Location = new Point(15
5
, 2),
\r
- Size = new Size(2
3
, height),
\r
+ Location = new Point(15
4
, 2),
\r
+ Size = new Size(2
4
, height),
\r
TextAlign = ContentAlignment.MiddleRight
\r
},
\r
new ShipLabel
\r
{
\r
TextAlign = ContentAlignment.MiddleRight
\r
},
\r
new ShipLabel
\r
{
\r
- Location = new Point(17
6
, 2),
\r
- Size = new Size(4
1
, height),
\r
+ Location = new Point(17
5
, 2),
\r
+ Size = new Size(4
2
, height),
\r
TextAlign = ContentAlignment.MiddleRight
\r
},
\r
new ShipLabel {Location = new Point(10, 2), AutoSize = true},
\r
TextAlign = ContentAlignment.MiddleRight
\r
},
\r
new ShipLabel {Location = new Point(10, 2), AutoSize = true},
\r