OSDN Git Service
(root)
/
kancollesniffer
/
KancolleSniffer.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
戦況のレイアウトを見直す
[kancollesniffer/KancolleSniffer.git]
/
KancolleSniffer
/
BattleResultPanel.cs
diff --git
a/KancolleSniffer/BattleResultPanel.cs
b/KancolleSniffer/BattleResultPanel.cs
index
60740dc
..
e65995b
100644
(file)
--- a/
KancolleSniffer/BattleResultPanel.cs
+++ b/
KancolleSniffer/BattleResultPanel.cs
@@
-156,7
+156,8
@@
namespace KancolleSniffer
{
\r
foreach (var panel in _panelList)
\r
panel.Visible = false;
\r
{
\r
foreach (var panel in _panelList)
\r
panel.Visible = false;
\r
- _rankLabel.Visible = _infomationPanel.Visible = false;
\r
+ _infomationPanel.Visible = false;
\r
+ _rankLabel.Text = "";
\r
}
\r
\r
private void ShowResult(BattleInfo.BattleResult result)
\r
}
\r
\r
private void ShowResult(BattleInfo.BattleResult result)
\r
@@
-239,7
+240,7
@@
namespace KancolleSniffer
_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
_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
- _infomationPanel.Location = new Point(AutoScrollPosition.X,
2 +
AutoScrollPosition.Y);
\r
+ _infomationPanel.Location = new Point(AutoScrollPosition.X, AutoScrollPosition.Y);
\r
_infomationPanel.Visible = true;
\r
}
\r
\r
_infomationPanel.Visible = true;
\r
}
\r
\r
@@
-266,7
+267,6
@@
namespace KancolleSniffer
\r
private void ShowResultRank(BattleResultRank rank)
\r
{
\r
\r
private void ShowResultRank(BattleResultRank rank)
\r
{
\r
- _rankLabel.Visible = true;
\r
var result = new[] {"完全S", "勝利S", "勝利A", "勝利B", "敗北C", "敗北D", "敗北E"};
\r
_rankLabel.Text = result[(int)rank];
\r
}
\r
var result = new[] {"完全S", "勝利S", "勝利A", "勝利B", "敗北C", "敗北D", "敗北E"};
\r
_rankLabel.Text = result[(int)rank];
\r
}
\r
@@
-275,20
+275,20
@@
namespace KancolleSniffer
{
\r
_phaseLabel = new Label
\r
{
\r
{
\r
_phaseLabel = new Label
\r
{
\r
- Location = new Point(7
8, 18
),
\r
+ Location = new Point(7
2, 21
),
\r
Size = new Size(31, 14)
\r
};
\r
_phaseLabel.Click += PhaseLabelClick;
\r
Controls.Add(_phaseLabel);
\r
_rankLabel = new Label
\r
{
\r
Size = new Size(31, 14)
\r
};
\r
_phaseLabel.Click += PhaseLabelClick;
\r
Controls.Add(_phaseLabel);
\r
_rankLabel = new Label
\r
{
\r
- Location = new Point(11
0, 18
),
\r
+ Location = new Point(11
1, 22
),
\r
Size = new Size(42, 12)
\r
};
\r
Controls.Add(_rankLabel);
\r
for (var i = 0; i < 14; i++)
\r
{
\r
Size = new Size(42, 12)
\r
};
\r
Controls.Add(_rankLabel);
\r
for (var i = 0; i < 14; i++)
\r
{
\r
- var y = LineHeight *
(i + 1)
;
\r
+ var y = LineHeight *
i + 21
;
\r
var panel = new Panel
\r
{
\r
Location = new Point(0, y),
\r
var panel = new Panel
\r
{
\r
Location = new Point(0, y),
\r
@@
-329,47
+329,53
@@
namespace KancolleSniffer
\r
public InformationPanel()
\r
{
\r
\r
public InformationPanel()
\r
{
\r
+ const int top = 4;
\r
+ const int left = 1;
\r
Visible = false;
\r
Visible = false;
\r
- Size = new Size(
213, 12
);
\r
+ Size = new Size(
left + 206, top + 15
);
\r
Controls.AddRange(_formation = new[]
\r
{
\r
new Label
\r
{
\r
Controls.AddRange(_formation = new[]
\r
{
\r
new Label
\r
{
\r
- Location = new Point(4
7
, 0),
\r
+ Location = new Point(4
6
, 0),
\r
Size = new Size(29, 12)
\r
},
\r
new Label
\r
{
\r
Size = new Size(29, 12)
\r
},
\r
new Label
\r
{
\r
- Location = new Point(7
5
, 0),
\r
+ Location = new Point(7
4
, 0),
\r
Size = new Size(29, 12)
\r
},
\r
new Label
\r
{
\r
Location = new Point(0, 0),
\r
Size = new Size(48, 12),
\r
Size = new Size(29, 12)
\r
},
\r
new Label
\r
{
\r
Location = new Point(0, 0),
\r
Size = new Size(48, 12),
\r
- TextAlign = ContentAlignment.Middle
Right
\r
+ TextAlign = ContentAlignment.Middle
Center
\r
}
\r
});
\r
Controls.AddRange(_fighterPower = new[]
\r
{
\r
new Label
\r
{
\r
}
\r
});
\r
Controls.AddRange(_fighterPower = new[]
\r
{
\r
new Label
\r
{
\r
- Location = new Point(16
8
, 0),
\r
+ Location = new Point(16
2
, 0),
\r
Size = new Size(23, 12),
\r
TextAlign = ContentAlignment.MiddleRight
\r
},
\r
new Label
\r
{
\r
Size = new Size(23, 12),
\r
TextAlign = ContentAlignment.MiddleRight
\r
},
\r
new Label
\r
{
\r
- Location = new Point(1
90
, 0),
\r
+ Location = new Point(1
83
, 0),
\r
Size = new Size(23, 12),
\r
TextAlign = ContentAlignment.MiddleRight
\r
},
\r
new Label
\r
{
\r
Size = new Size(23, 12),
\r
TextAlign = ContentAlignment.MiddleRight
\r
},
\r
new Label
\r
{
\r
- Location = new Point(11
6
, 0),
\r
+ Location = new Point(11
0
, 0),
\r
Size = new Size(53, 12)
\r
}
\r
});
\r
Size = new Size(53, 12)
\r
}
\r
});
\r
+ foreach (Control control in Controls)
\r
+ control.Location = new Point(control.Location.X + left, control.Location.Y + top);
\r
+ // ReSharper disable once VirtualMemberCallInConstructor
\r
+ BackColor = ShipLabels.ColumnColors[1];
\r
}
\r
\r
public void SetInformation(BattleInfo battleInfo)
\r
}
\r
\r
public void SetInformation(BattleInfo battleInfo)
\r