#50

tym32167 · Nov 18, 2016 · d26fa32 · d26fa32
1 parent 5615b90
commit d26fa32
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/src/Arma3BE.Client.Modules.ChatModule/Boxes/ColoredTextControl.xaml b/src/Arma3BE.Client.Modules.ChatModule/Boxes/ColoredTextControl.xaml
@@ -3,11 +3,8 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:Arma3BE.Client.Modules.ChatModule.Boxes"
-             mc:Ignorable="d" 
-             d:DesignHeight="300" d:DesignWidth="300">
-    <ScrollViewer Grid.ColumnSpan="3" Name="ChatScrollViewer">
-
+             mc:Ignorable="d" >
+    <ScrollViewer Name="ChatScrollViewer">
         <RichTextBox Name="msgBox" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
                                      IsReadOnly="True" IsReadOnlyCaretVisible="False"
                                      FontSize="14" FontWeight="Medium" FontStyle="Normal" Background="#F0F0F0">
@@ -17,6 +14,5 @@
                 </Style>
             </RichTextBox.Resources>
         </RichTextBox>
-
     </ScrollViewer>
 </UserControl>
diff --git a/src/Arma3BE.Client.Modules.ChatModule/Boxes/ColoredTextControl.xaml.cs b/src/Arma3BE.Client.Modules.ChatModule/Boxes/ColoredTextControl.xaml.cs
@@ -27,6 +27,7 @@ public ColoredTextControl()
         private void InitBox()
         {
             msgBox.Document.Blocks.Clear();
+            _paragraph = new Paragraph();
             msgBox.Document.Blocks.Add(_paragraph);
         }
 

diff --git a/src/Arma3BE.Client.Modules.ChatModule/Chat/ChatControl.xaml b/src/Arma3BE.Client.Modules.ChatModule/Chat/ChatControl.xaml
@@ -65,7 +65,7 @@
                         <ColumnDefinition Width="Auto" />
                     </Grid.ColumnDefinitions>
 
-                    <boxes:ColoredTextControl x:Name="textControl">
+                    <boxes:ColoredTextControl x:Name="textControl" Grid.ColumnSpan="3">
                     </boxes:ColoredTextControl>
 
                     <ComboBox Grid.Row="1" Grid.Column="0" Margin="2" ItemsSource="{Binding Players, Mode=OneWay}"