ownSoft/Chat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Emojiilist fix

Browse Source 
Text Fix(da es bis unter der büroklammer kamm)
Contextmenue Kopieren Eingefügt
This commit is contained in:
Waldi
2017-09-18 13:07:37 +02:00
parent ea64707439
commit 1430cfc2dd
6 changed files with 122 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
ChatController/ChatMainControl.xaml
View File

@@ -8,8 +8,8 @@
d:DesignHeight="300" d:DesignWidth="300" >
<Grid>
<GroupBox Header="Chat" x:Name="rootGroupBox" >
<!--MouseLeftButtonDown="RootGroupBox_OnMouseLeftButtonDown"Style="{DynamicResource MainContentGroupBoxWithoutMaximizeBtnStyle}"-->
<GroupBox Header="Chat" x:Name="rootGroupBox">
<!--Style="{DynamicResource MainContentGroupBoxWithoutMaximizeBtnStyle}"-->
<Grid >
<!--Background="{StaticResource ObjectEditBackgroundBrush}"-->
<Grid.ColumnDefinitions>
@@ -252,13 +252,13 @@
<!-- Bild bereich-->
<DockPanel DockPanel.Dock="Bottom" Visibility="{Binding PictureVisibility}" >
<StackPanel Orientation="Vertical">
<Image Stretch="Uniform" MaxHeight="200" MaxWidth="300" Source="{Binding ImageSources}" RenderOptions.BitmapScalingMode="HighQuality" />
<Image Stretch="Uniform" MaxHeight="200" MaxWidth="300" Source="{Binding ImageSources}" RenderOptions.BitmapScalingMode="HighQuality" />
<!--<TextBlock Text="{Binding UserMessage}" VerticalAlignment="Center" HorizontalAlignment="Center"/>-->
</StackPanel>
</DockPanel>
<!-- Gif BEreich ??
<!-- Gif BEreich ?? <MediaElement Source="" ></MediaElement> villeicht gif erstmal runterladen und dann den pfad ausgeben ? 200
<DockPanel DockPanel.Dock="Bottom" Visibility="{Binding GifPictureVisibility}" >
<StackPanel Orientation="Vertical">
<MediaElement LoadedBehavior="Play" UnloadedBehavior="Manual" MediaFailed="MediaElement_OnMediaFailed" MediaEnded="MediaElement_OnMediaEnded" Source="{Binding UserMessage}" Stretch="Uniform" MaxHeight="200" MaxWidth="300" >
@@ -319,9 +319,9 @@
<Grid Grid.Column="0" Grid.ColumnSpan="2" MinHeight="25">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="9.5*"/>
<ColumnDefinition Width=".5*"/>
<ColumnDefinition Width=".5*"/>
<ColumnDefinition Width="9*"/>
<ColumnDefinition Width="30"/>
<ColumnDefinition Width="30"/>
</Grid.ColumnDefinitions>
<TextBox x:Name="Chatbox" HorizontalAlignment="Stretch" Grid.Column="0" Grid.ColumnSpan="3" TextWrapping="Wrap" Text="Nachricht schreiben" VerticalScrollBarVisibility="Hidden" MaxLines="5" MaxHeight="70" Visibility="Visible"
@@ -329,17 +329,19 @@
<TextBox.Resources>
<Style TargetType="{x:Type Border}">
<Setter Property="CornerRadius" Value="3"/>
<Setter Property="Padding" Value="10,0,55,0" />
<Setter Property="Padding" Value="10,0,60,0" />
</Style>
</TextBox.Resources>
</TextBox>
<Button Grid.Column="1" Style="{x:Null}" Height="25" Width="25" Background="Transparent" BorderThickness="0" Margin="1,0,0,0" VerticalAlignment="Bottom" ToolTip="Datei einfügen" Click="MediaButton_OnClick">
<Button Grid.Column="1" Style="{x:Null}" Height="25" Background="Transparent" BorderThickness="0" Margin="1,0,0,0" VerticalAlignment="Bottom" ToolTip="Datei einfügen" Click="MediaButton_OnClick" >
<Image Height="15" Width="15" Source='pack://application:,,,/ChatController;component/Ressourcen/paperclip.png' Margin="3" RenderOptions.BitmapScalingMode="HighQuality" HorizontalAlignment="Right"/>
</Button>
<Button Grid.Column="2" Style="{x:Null}" Height="25" Width="25" Background="Transparent" BorderThickness="0" x:Name="EmojiButton" Margin="1,0,0,0" VerticalAlignment="Bottom" ToolTip="Emoji einfügen" Click="EmojiButton_OnClick">
<Button Grid.Column="2" Style="{x:Null}" Height="25" Background="Transparent" BorderThickness="0" x:Name="EmojiButton" Margin="2,0,0,0" VerticalAlignment="Bottom" ToolTip="Emoji einfügen" Click="EmojiButton_OnClick">
<Image Height="15" Width="15" Source='pack://application:,,,/ChatController;component/Ressourcen/glucklicher.png' Margin="3" RenderOptions.BitmapScalingMode="HighQuality" HorizontalAlignment="Right"/>
</Button>
</Grid>