Merge branch 'lobbies' into setupBranch

This commit is contained in:
Sem van der Hoeven
2020-10-21 20:44:11 +02:00
10 changed files with 316 additions and 32 deletions

View File

@@ -113,5 +113,10 @@ namespace Client.Views
string user = data.User.Username;
SentMessage.AppendText($"{user}: {message}\n");
}
private void Window_Closing(object sender, System.ComponentModel.CancelEventArgs e)
{
}
}
}

View File

@@ -34,6 +34,7 @@ namespace Client.Views
Application.Current.Dispatcher.Invoke(delegate {
data.User = user;
data.Client = client;
client.SendMessage(JSONConvert.ConstructLobbyRequestMessage());
MainWindow startWindow = new MainWindow();
startWindow.Show();
this.Close();

View File

@@ -33,18 +33,7 @@ namespace Client
private void Button_Click(object sender, RoutedEventArgs e)
{
Lobby lobbySelected = LobbyList.SelectedItem as Lobby;
if(lobbySelected != null)
{
testLabel.Content = lobbySelected.ID;
colorSelection.IsEnabled = false;
joinButton.IsEnabled = false;
hostButton.IsEnabled = false;
GameWindow window = new GameWindow();
window.Show();
Close();
}
}
}
}