XIVChat
/
XIVChat
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

chore(desktop): line endings and trailing spaces

This commit is contained in:
Anna 2020-11-01 10:41:03 -05:00
parent d8ef1265ee
commit 98cdf7916e
2 changed files with 30 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
XIVChat Desktop/Connection.cs
View File

@ -80,11 +80,11 @@ namespace XIVChat_Desktop {
this.app.LastHost = currentHost;
});
}
this.Dispatch(() => {
this.app.Window.AddSystemMessage("Connected");
});
// check if backlog or catch-up is needed
if (sameHost) {
// catch-up
@ -141,6 +141,7 @@ namespace XIVChat_Desktop {
if (this.incoming.Reader.Completion.IsCompleted) {
break;
}
var rawMessage = await incoming;
incoming = this.incoming.Reader.ReadAsync().AsTask();
@ -178,7 +179,10 @@ namespace XIVChat_Desktop {
break;
}
}
// remove player data
this.SetPlayerData(null);
// at this point, we are disconnected, so log it
this.Dispatch(() => {
this.app.Window.AddSystemMessage("Disconnected");
@ -215,24 +219,7 @@ namespace XIVChat_Desktop {
case ServerOperation.PlayerData:
var playerData = payload.Length == 0 ? null : PlayerData.Decode(payload);
var visibility = playerData == null ? Visibility.Collapsed : Visibility.Visible;
this.Dispatch(() => {
var window = this.app.Window;
window.LoggedInAs.Content = playerData?.name;
window.LoggedInAs.Visibility = visibility;
window.LoggedInAsSeparator.Visibility = visibility;
window.CurrentWorld.Content = playerData?.currentWorld;
window.CurrentWorld.Visibility = visibility;
window.CurrentWorldSeparator.Visibility = visibility;
window.Location.Content = playerData?.location;
window.Location.Visibility = visibility;
});
this.SetPlayerData(playerData);
break;
case ServerOperation.Availability:
break;
@ -262,6 +249,27 @@ namespace XIVChat_Desktop {
}
}
private void SetPlayerData(PlayerData? playerData) {
var visibility = playerData == null ? Visibility.Collapsed : Visibility.Visible;
this.Dispatch(() => {
var window = this.app.Window;
window.LoggedInAs.Content = playerData?.name;
window.LoggedInAs.Visibility = visibility;
window.LoggedInAsSeparator.Visibility = visibility;
window.CurrentWorld.Content = playerData?.currentWorld;
window.CurrentWorld.Visibility = visibility;
window.CurrentWorldSeparator.Visibility = visibility;
window.Location.Content = playerData?.location;
window.Location.Visibility = visibility;
});
}
private void Dispatch(Action action) {
this.app.Dispatcher.BeginInvoke(action);
}

1
XIVChat Desktop/ManageServer.xaml.cs
View File

@ -21,6 +21,7 @@ namespace XIVChat_Desktop {
}
private void Save_Click(object sender, RoutedEventArgs e) {
// FIXME: this shouldn't be using data bindings because it should only take effect after clicking save
var serverName = this.ServerName.Text;
var serverHost = this.ServerHost.Text;