Projects/Vocaluxe
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Partially revert commit and fix wrong partymode table for good

Browse Source
This commit is contained in:
Flamefire committed 2014-10-15 17:57:15 +02:00
1 parent b988d5f0fe
commit 98601bd7b1
4 files changed
+11 -15
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Output/PartyModes/Challenge/Themes/Default/Screens/PartyScreenChallengeMain.xml
+1 -1
View File
@@ -379,7 +379,7 @@
<ResizeAlign>Center</ResizeAlign> <ResizeAlign>Center</ResizeAlign>
<Style>Bold</Style> <Style>Bold</Style>
<Font>Outline</Font> <Font>Outline</Font>
<Text /> <Text>1)</Text>
<Reflection Enabled="false" /> <Reflection Enabled="false" />
</Text> </Text>
<Text Name="TextRoundPlayer"> <Text Name="TextRoundPlayer">
Output/PartyModes/ChallengeMedley/Themes/Default/Screens/PartyScreenChallengeMedleyMain.xml
+1 -1
View File
@@ -379,7 +379,7 @@
<ResizeAlign>Center</ResizeAlign> <ResizeAlign>Center</ResizeAlign>
<Style>Bold</Style> <Style>Bold</Style>
<Font>Outline</Font> <Font>Outline</Font>
<Text /> <Text>1)</Text>
<Reflection Enabled="false" /> <Reflection Enabled="false" />
</Text> </Text>
<Text Name="TextRoundPlayer"> <Text Name="TextRoundPlayer">
PartyModes/PartyModeChallenge/CPartyScreenChallengeMain.cs
+5 -7
View File
@@ -431,8 +431,6 @@ namespace VocaluxeLib.PartyModes.Challenge
private void _BuildRoundsTable() private void _BuildRoundsTable()
{ {
if (_RoundsTable.Count == 0)
return;
_RoundsTableScrollArea = new SRectF(); _RoundsTableScrollArea = new SRectF();
const int numPlayerInOneRow = 3; const int numPlayerInOneRow = 3;
@@ -441,14 +439,14 @@ namespace VocaluxeLib.PartyModes.Challenge
if (_NumRoundsVisible > _GameState.Combs.Count) if (_NumRoundsVisible > _GameState.Combs.Count)
_NumRoundsVisible = _GameState.Combs.Count; _NumRoundsVisible = _GameState.Combs.Count;
float numberX = _RoundsTable[0].Number.X; float numberX = _Texts[_TextRoundNumber].X;
float numberY = _RoundsTable[0].Number.Y; float numberY = _Texts[_TextRoundNumber].Y;
_RoundsTableScrollArea.X = numberX; _RoundsTableScrollArea.X = numberX;
_RoundsTableScrollArea.Y = numberY; _RoundsTableScrollArea.Y = numberY;
_RoundsTableScrollArea.W = CBase.Settings.GetRenderW() - _RoundsTable[0].Number.X - 20; _RoundsTableScrollArea.W = CBase.Settings.GetRenderW() - _Texts[_TextRoundNumber].X - 20;
float delta = _RoundsTable[0].Number.Rect.H; float delta = _Texts[_TextRoundNumber].Rect.H;
//Update statics and texts for rounds //Update statics and texts for rounds
foreach (CRoundsTableRow roundRow in _RoundsTable) foreach (CRoundsTableRow roundRow in _RoundsTable)
@@ -481,7 +479,7 @@ namespace VocaluxeLib.PartyModes.Challenge
roundRow.TextScores[column].Y = numberY + delta; roundRow.TextScores[column].Y = numberY + delta;
roundRow.TextScores[column].MaxWidth = maxw; roundRow.TextScores[column].MaxWidth = maxw;
} }
numberY = numberY + 2 * delta; numberY = numberY + 2*delta;
} }
numberY = numberY + delta / 2; numberY = numberY + delta / 2;
} }
PartyModes/PartyModeChallengeMedley/CPartyScreenChallengeMedleyMain.cs
+4 -6
View File
@@ -431,8 +431,6 @@ namespace VocaluxeLib.PartyModes.ChallengeMedley
private void _BuildRoundsTable() private void _BuildRoundsTable()
{ {
if (_RoundsTable.Count == 0)
return;
_RoundsTableScrollArea = new SRectF(); _RoundsTableScrollArea = new SRectF();
const int numPlayerInOneRow = 3; const int numPlayerInOneRow = 3;
@@ -441,14 +439,14 @@ namespace VocaluxeLib.PartyModes.ChallengeMedley
if (_NumRoundsVisible > _GameState.Combs.Count) if (_NumRoundsVisible > _GameState.Combs.Count)
_NumRoundsVisible = _GameState.Combs.Count; _NumRoundsVisible = _GameState.Combs.Count;
float numberX = _RoundsTable[0].Number.X; float numberX = _Texts[_TextRoundNumber].X;
float numberY = _RoundsTable[0].Number.Y; float numberY = _Texts[_TextRoundNumber].Y;
_RoundsTableScrollArea.X = numberX; _RoundsTableScrollArea.X = numberX;
_RoundsTableScrollArea.Y = numberY; _RoundsTableScrollArea.Y = numberY;
_RoundsTableScrollArea.W = CBase.Settings.GetRenderW() - _RoundsTable[0].Number.X - 20; _RoundsTableScrollArea.W = CBase.Settings.GetRenderW() - _Texts[_TextRoundNumber].X - 20;
float delta = _RoundsTable[0].Number.Rect.H; float delta = _Texts[_TextRoundNumber].Rect.H;
//Update statics and texts for rounds //Update statics and texts for rounds
foreach (CRoundsTableRow roundRow in _RoundsTable) foreach (CRoundsTableRow roundRow in _RoundsTable)