sem/Csharp-eindproject
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[TRYING]

Browse Source
This commit is contained in:
Lars
2020-10-23 20:26:05 +02:00
parent 9558c75eab
commit 3c0f5018db
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Client/ViewModels/ViewModelGame.cs
View File

@@ -73,7 +73,12 @@ namespace Client.ViewModels
data.Client.RandomWord = HandleRandomWord; data.Client.RandomWord = HandleRandomWord;
data.Client.IncomingMsg = HandleIncomingMsg; data.Client.IncomingMsg = HandleIncomingMsg;
data.Client.IncomingPlayer = HandleIncomingPlayer; data.Client.IncomingPlayer = HandleIncomingPlayer;
data.Client.UpdateUserScores = UpdateUserScores; data.Client.UpdateUserScores = UpdateUserScores;
queueTimer = new Timer(50);
queueTimer.Start();
queueTimer.Elapsed += sendArrayFromQueue;
} }
public ICommand OnKeyDown { get; set; } public ICommand OnKeyDown { get; set; }
@@ -82,10 +87,7 @@ namespace Client.ViewModels
public void BeginGame() public void BeginGame()
{ {
queueTimer = new Timer(50);
queueTimer.Start();
queueTimer.Elapsed += sendArrayFromQueue;
data.Client.SendMessage(JSONConvert.ConstructGameStartData(data.Lobby.ID)); data.Client.SendMessage(JSONConvert.ConstructGameStartData(data.Lobby.ID));
} }
@@ -186,7 +188,7 @@ namespace Client.ViewModels
private void CanvasResetData() private void CanvasResetData()
{ {
this.window.CanvasForPaint.Children.Clear(); this.window.CanvasForPaint.Children.Clear();
} }
private void ChatBox_KeyDown() private void ChatBox_KeyDown()

2
Client/Views/GameWindow.xaml
View File

@@ -43,7 +43,7 @@
<Button Name="CanvasReset" Click="CanvasReset_Click" Grid.Row="0" Grid.Column="3" Content="RESET"/> <Button Name="CanvasReset" Click="CanvasReset_Click" Grid.Row="0" Grid.Column="3" Content="RESET"/>
</Grid> </Grid>
<Button Name="StartGame" Grid.Row="0" Grid.Column="2" Content="Start Game" FontSize="20" Command="{Binding ButtonStartGame}" IsEnabled="{Binding IsHost}"/>
<Border Grid.Row="1" Grid.Column="1" Margin ="10,10,10,10" BorderBrush="Black" BorderThickness ="2.5"> <Border Grid.Row="1" Grid.Column="1" Margin ="10,10,10,10" BorderBrush="Black" BorderThickness ="2.5">