RedGuy/RMafia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix chats

Browse Source
This commit is contained in:
Ilya 2021-03-04 17:08:54 +03:00
parent 4306daf5a1
commit 96171d4d70
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
MafiaClient/MainWindow.axaml
View File

@ -109,7 +109,7 @@
</Grid.RowDefinitions> </Grid.RowDefinitions>
<TextBlock Text="Ник:" FontSize="25" Grid.Column="1" Grid.Row="1" HorizontalAlignment="Right"></TextBlock> <TextBlock Text="Ник:" FontSize="25" Grid.Column="1" Grid.Row="1" HorizontalAlignment="Right"></TextBlock>
<TextBox Grid.Column="2" Grid.ColumnSpan="2" Grid.Row="1" FontSize="25" x:Name="NickBox" TextInput="NickBox_OnTextInput"></TextBox> <TextBox Grid.Column="2" Grid.ColumnSpan="2" Grid.Row="1" FontSize="25" x:Name="NickBox"></TextBox>
<Button Grid.Column="4" Grid.ColumnSpan="3" Grid.Row="11" Click="SettingsBack_OnClick" HorizontalAlignment="Stretch"> <Button Grid.Column="4" Grid.ColumnSpan="3" Grid.Row="11" Click="SettingsBack_OnClick" HorizontalAlignment="Stretch">
<Viewbox> <Viewbox>
<TextBlock Text="Назад" FontSize="25"></TextBlock> <TextBlock Text="Назад" FontSize="25"></TextBlock>
@ -257,7 +257,9 @@
</Grid.RowDefinitions> </Grid.RowDefinitions>
<TextBlock Grid.Row="1" Grid.Column="2" Grid.ColumnSpan="7" HorizontalAlignment="Center" FontSize="30" x:Name="GameVotingActiveRole"></TextBlock> <TextBlock Grid.Row="1" Grid.Column="2" Grid.ColumnSpan="7" HorizontalAlignment="Center" FontSize="30" x:Name="GameVotingActiveRole"></TextBlock>
<ListBox Grid.Column="5" Grid.ColumnSpan="5" Grid.Row="2" Grid.RowSpan="8" x:Name="GameVotingActiveChat"></ListBox> <ScrollViewer Grid.Column="5" Grid.ColumnSpan="5" Grid.Row="2" Grid.RowSpan="8" x:Name="GameVotingActiveChatViewer">
<ItemsRepeater x:Name="GameVotingActiveChat"></ItemsRepeater>
</ScrollViewer>
<TextBox Grid.Column="5" Grid.ColumnSpan="4" Grid.Row="10" TextWrapping="Wrap" x:Name="GameVotingActiveChatInput"></TextBox> <TextBox Grid.Column="5" Grid.ColumnSpan="4" Grid.Row="10" TextWrapping="Wrap" x:Name="GameVotingActiveChatInput"></TextBox>
<Button Grid.Column="9" Grid.Row="10" Click="GameVotingActiveChatSend_OnClick" HorizontalAlignment="Stretch"> <Button Grid.Column="9" Grid.Row="10" Click="GameVotingActiveChatSend_OnClick" HorizontalAlignment="Stretch">
<Viewbox> <Viewbox>
@ -323,7 +325,9 @@
<RowDefinition Height="10*"></RowDefinition> <RowDefinition Height="10*"></RowDefinition>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<TextBlock FontSize="30" x:Name="GameDayHotBar" Text="Обсуждай и думай" Grid.Row="1" Grid.Column="2" Grid.ColumnSpan="7" HorizontalAlignment="Center" TextAlignment="Center"></TextBlock> <TextBlock FontSize="30" x:Name="GameDayHotBar" Text="Обсуждай и думай" Grid.Row="1" Grid.Column="2" Grid.ColumnSpan="7" HorizontalAlignment="Center" TextAlignment="Center"></TextBlock>
<ListBox Grid.Column="5" Grid.ColumnSpan="5" Grid.Row="2" Grid.RowSpan="8" x:Name="GameDayChat"></ListBox> <ScrollViewer Grid.Column="5" Grid.ColumnSpan="5" Grid.Row="2" Grid.RowSpan="8" x:Name="GameDayViewer">
<ItemsRepeater x:Name="GameDayChat"></ItemsRepeater>
</ScrollViewer>
<TextBox Grid.Column="5" Grid.ColumnSpan="4" Grid.Row="10" TextWrapping="Wrap" x:Name="GameDayChatInput"></TextBox> <TextBox Grid.Column="5" Grid.ColumnSpan="4" Grid.Row="10" TextWrapping="Wrap" x:Name="GameDayChatInput"></TextBox>
<Button Grid.Column="9" Grid.Row="10" Click="GameDayChatSend_OnClick" HorizontalAlignment="Stretch"> <Button Grid.Column="9" Grid.Row="10" Click="GameDayChatSend_OnClick" HorizontalAlignment="Stretch">
<Viewbox> <Viewbox>

6
MafiaClient/MainWindow.axaml.cs
View File

@ -102,6 +102,7 @@ namespace MafiaClient
private void SettingsBack_OnClick(object sender, RoutedEventArgs e) private void SettingsBack_OnClick(object sender, RoutedEventArgs e)
{ {
Settings.Config().Nick = this.FindControl <TextBox> ("NickBox").Text;
Settings.Save(); Settings.Save();
HideAll(); HideAll();
this.Find<Grid>("MainMenu").IsVisible = true; this.Find<Grid>("MainMenu").IsVisible = true;
@ -118,11 +119,6 @@ namespace MafiaClient
this.FindControl<TextBox>("NickBox").Text = Settings.Config().Nick; this.FindControl<TextBox>("NickBox").Text = Settings.Config().Nick;
} }
private void NickBox_OnTextInput(object sender, TextInputEventArgs e)
{
Settings.Config().Nick = this.FindControl<TextBox>("NickBox").Text;
}
public void ShowGameQueueScreen() public void ShowGameQueueScreen()
{ {
HideAll(); HideAll();