Update UI for better display when using languages with long words

PicView/Views/UserControls/Buttons/InfoButton.xaml

@@ -14,7 +14,7 @@
             <Image
                 Width="14"
                 Height="14"
-                Margin="5,0,0,0">
+                Margin="2,0,0,0">
                 <Image.Source>
                     <DrawingImage>
                         <DrawingImage.Drawing>
@@ -30,14 +30,13 @@
                 </Image.Source>
             </Image>
             <TextBlock
-                Margin="5,0,5,0"
+                MaxWidth="70"
+                Margin="3,0,3,0"
                 FontFamily="/PicView;component/Themes/Resources/fonts/#Roboto Medium"
                 FontSize="13"
-                MaxWidth="57"
                 Text="{StaticResource About}"
-                ToolTip="{StaticResource About}"
-                TextWrapping="Wrap"
-                TextTrimming="CharacterEllipsis">
+                TextTrimming="CharacterEllipsis"
+                ToolTip="{StaticResource About}">
                 <TextBlock.Foreground>
                     <SolidColorBrush x:Name="txtBrush" Color="{StaticResource MainColor}" />
                 </TextBlock.Foreground>

PicView/Views/UserControls/Buttons/SettingsButton.xaml

@@ -11,10 +11,7 @@
             <SolidColorBrush x:Name="TheButtonBrush" Color="Transparent" />
         </Button.Background>
         <StackPanel Orientation="Horizontal">
-            <Image
-                Width="18"
-                Height="18"
-                Margin="6,0,0,0">
+            <Image Width="18" Margin="3,0,0,0">
                 <Image.Source>
                     <DrawingImage>
                         <DrawingImage.Drawing>
@@ -51,13 +48,13 @@
                 </Image.Source>
             </Image>
             <TextBlock
-                Margin="5,0,5,0"
+                MaxWidth="80"
+                Margin="3,0,3,0"
                 FontFamily="/PicView;component/Themes/Resources/fonts/#Roboto Medium"
                 FontSize="13"
-                MaxWidth="57"
                 Text="{StaticResource Settings}"
-                ToolTip="{StaticResource Settings}"
-                TextTrimming="CharacterEllipsis">
+                TextTrimming="CharacterEllipsis"
+                ToolTip="{StaticResource Settings}">
                 <TextBlock.Foreground>
                     <SolidColorBrush x:Name="txtBrush" Color="{StaticResource MainColor}" />
                 </TextBlock.Foreground>

PicView/Views/UserControls/Menus/ToolsAndEffectsMenu.xaml

@@ -7,7 +7,10 @@
     Foreground="{StaticResource MainColorBrush}">
 
     <UserControl.Resources>
-        <SolidColorBrush x:Name="IconBrush" x:Key="IconBrush" Color="{StaticResource IconColor}" />
+        <SolidColorBrush
+            x:Key="IconBrush"
+            x:Name="IconBrush"
+            Color="{StaticResource IconColor}" />
     </UserControl.Resources>
 
     <StackPanel>
@@ -40,9 +43,9 @@
                         Stroke="{StaticResource BorderBrush}"
                         StrokeThickness="1" />
 
-                    <Button 
+                    <Button
                         x:Name="ResizeButton"
-                        Width="169"  
+                        Width="169"
                         FontFamily="/PicView;component/Themes/Resources/fonts/#Roboto Medium">
                         <Button.Background>
                             <SolidColorBrush x:Name="ResizeButtonBrush" Color="Transparent" />
@@ -51,22 +54,22 @@
                             <TextBlock
                                 Width="126"
                                 MaxWidth="126"
-                                Margin="0,2,0,2"
-                                FontSize="13"
+                                Margin="2,2,2,2"
+                                VerticalAlignment="Center"
+                                FontSize="12"
                                 Text="{StaticResource BatchResize}"
                                 TextAlignment="Center"
-                                TextWrapping="Wrap" 
                                 TextTrimming="CharacterEllipsis"
-                                VerticalAlignment="Center">
+                                TextWrapping="Wrap">
                                 <TextBlock.Foreground>
                                     <SolidColorBrush x:Name="ResizeText" Color="{StaticResource MainColor}" />
                                 </TextBlock.Foreground>
                             </TextBlock>
                             <Canvas Width="51" Height="51">
-                                <Image 
-                                    Height="22" 
+                                <Image
                                     Canvas.Left="0"
-                                    Canvas.Top="15">
+                                    Canvas.Top="15"
+                                    Height="22">
                                     <Image.Source>
                                         <DrawingImage>
                                             <DrawingImage.Drawing>
@@ -78,12 +81,12 @@
                                     </Image.Source>
                                 </Image>
 
-                                <Image 
-                                    Panel.ZIndex="-1"
-                                    Opacity=".9"
-                                    Height="16"
+                                <Image
                                     Canvas.Left="15"
-                                    Canvas.Top="18">
+                                    Canvas.Top="18"
+                                    Height="16"
+                                    Panel.ZIndex="-1"
+                                    Opacity=".9">
                                     <Image.Source>
                                         <DrawingImage>
                                             <DrawingImage.Drawing>
@@ -95,12 +98,12 @@
                                     </Image.Source>
                                 </Image>
 
-                                <Image 
-                                    Panel.ZIndex="-2"
-                                    Opacity=".7"
-                                    Height="10"
+                                <Image
                                     Canvas.Left="27"
-                                    Canvas.Top="21">
+                                    Canvas.Top="21"
+                                    Height="10"
+                                    Panel.ZIndex="-2"
+                                    Opacity=".7">
                                     <Image.Source>
                                         <DrawingImage>
                                             <DrawingImage.Drawing>
@@ -139,7 +142,7 @@
                                 Width="110"
                                 MaxWidth="110"
                                 Margin="0,2,0,2"
-                                FontSize="13"
+                                FontSize="12"
                                 Text="{StaticResource Effects}"
                                 TextAlignment="Center"
                                 TextTrimming="CharacterEllipsis"
@@ -151,8 +154,8 @@
                             <Image
                                 Width="17"
                                 Height="17"
-                                Stretch="Fill" 
-                                Margin="0,0,7,0">
+                                Margin="0,0,7,0"
+                                Stretch="Fill">
                                 <Image.Source>
                                     <DrawingImage>
                                         <DrawingImage.Drawing>
@@ -202,7 +205,7 @@
                                     Width="126"
                                     MaxWidth="126"
                                     Margin="0,2,2,2"
-                                    FontSize="13"
+                                    FontSize="12"
                                     Text="{StaticResource ImageInfo}"
                                     TextAlignment="Center"
                                     TextWrapping="Wrap">
@@ -242,7 +245,7 @@
                                     Width="136"
                                     MaxWidth="136"
                                     Margin="0,2,2,2"
-                                    FontSize="13"
+                                    FontSize="12"
                                     Text="{StaticResource ColorPickerTool}"
                                     TextAlignment="Center"
                                     TextWrapping="Wrap">
@@ -283,7 +286,7 @@
                                     Width="126"
                                     MaxWidth="126"
                                     Margin="0,2,2,2"
-                                    FontSize="13"
+                                    FontSize="12"
                                     Text="{StaticResource OptimizeImage}"
                                     TextAlignment="Center"
                                     TextWrapping="Wrap">
@@ -345,14 +348,14 @@
                                 <SolidColorBrush x:Name="BgBrush" />
                             </StackPanel.Background>
                             <TextBlock
-                                    Width="136"
-                                    MaxWidth="136"
-                                    VerticalAlignment="Center"
-                                    Margin="4,2,2,2"
-                                    FontSize="13"
-                                    Text="{StaticResource ChangeBackground}"
-                                    TextAlignment="Center"
-                                    TextWrapping="Wrap">
+                                Width="136"
+                                MaxWidth="136"
+                                Margin="4,2,2,2"
+                                VerticalAlignment="Center"
+                                FontSize="12"
+                                Text="{StaticResource ChangeBackground}"
+                                TextAlignment="Center"
+                                TextWrapping="Wrap">
                                 <TextBlock.Foreground>
                                     <SolidColorBrush x:Name="BgText" Color="{StaticResource MainColor}" />
                                 </TextBlock.Foreground>

PicView/Views/Windows/InfoWindow.xaml

@@ -25,6 +25,12 @@
             <Setter Property="FontSize" Value="11" />
             <Setter Property="Foreground" Value="{StaticResource MainColorFadedBrush}" />
         </Style>
+        <Style TargetType="TextBlock">
+            <Setter Property="VerticalAlignment" Value="Center" />
+            <Setter Property="TextTrimming" Value="CharacterEllipsis" />
+            <Setter Property="TextWrapping" Value="Wrap" />
+            <Setter Property="ToolTip" Value="{Binding RelativeSource={RelativeSource Self}, Path=Text}" />
+        </Style>
     </Window.Resources>
 
     <DockPanel LastChildFill="True">
@@ -35,52 +41,28 @@
             Background="{StaticResource WindowBackgroundColorBrush}"
             DockPanel.Dock="Top">
 
-            <uc:Icon Width="35" />
-
-            <Rectangle
-                Width="1"
-                Height="30"
-                Margin="6,0,0,0"
-                Fill="{StaticResource BorderBrush}" />
+            <uc:Icon />
 
             <uc:CloseButton
                 x:Name="CloseButton"
                 Width="30"
                 Height="30"
-                VerticalAlignment="Center"
                 DockPanel.Dock="Right" />
 
-            <Rectangle
-                Width="1"
-                Height="30"
-                DockPanel.Dock="Right"
-                Fill="{StaticResource BorderBrush}" />
-
             <uc:MinButton
                 x:Name="MinButton"
                 Width="30"
                 Height="30"
-                VerticalAlignment="Center"
                 DockPanel.Dock="Right" />
 
-            <Rectangle
-                Width="1"
-                Height="30"
-                DockPanel.Dock="Right"
-                Fill="{StaticResource BorderBrush}" />
-
             <TextBlock
-                x:Name="Bar"
-                Height="30"
-                Padding="0,5,0,0"
+                Width="Auto"
+                Margin="0,0,0,0"
                 VerticalAlignment="Center"
-                Background="{StaticResource BackgroundSubtleHighlightBrush}"
-                FontSize="16"
-                FontWeight="Bold"
-                Foreground="{StaticResource MainColorBrush}"
+                FontFamily="/PicView;component/Themes/Resources/fonts/#Roboto Bold"
+                FontSize="14"
                 Text="{StaticResource InfoWindowTitle}"
-                TextAlignment="Center"
-                TextTrimming="CharacterEllipsis" />
+                TextAlignment="Center" />
         </DockPanel>
 
         <Rectangle
@@ -117,7 +99,6 @@
                                 </Hyperlink.Foreground>
                                 <TextBlock
                                     x:Name="GitHub"
-                                    d:Text="Github repository"
                                     FontSize="14"
                                     Text="{StaticResource ResourceKey=GithubRepo}"
                                     TextAlignment="Center"
@@ -230,7 +211,6 @@
                 <Label
                     Margin="0,12,0,4"
                     HorizontalAlignment="Center"
-                    d:Content="Application Shortcuts"
                     Content="{StaticResource ResourceKey=ApplicationShortcuts}"
                     FontFamily="/PicView;component/Themes/Resources/fonts/#Roboto Black"
                     FontSize="16" />
@@ -238,7 +218,6 @@
                 <Label
                     Width="480"
                     Margin="-4,0,0,10"
-                    d:Content="Navigation"
                     Content="{StaticResource ResourceKey=Navigation}" />
 
                 <Grid Width="480" Margin="0,0,0,20">
@@ -335,7 +314,6 @@
                         <TextBlock
                             HorizontalAlignment="Center"
                             VerticalAlignment="Center"
-                            d:Text="Right"
                             FontSize="12"
                             Text="{StaticResource ResourceKey=Left}" />
                     </Border>
@@ -364,10 +342,7 @@
                             HorizontalAlignment="Center"
                             VerticalAlignment="Center"
                             Orientation="Horizontal">
-                            <TextBlock
-                                d:Text="Ctrl"
-                                FontSize="12"
-                                Text="{StaticResource ResourceKey=Ctrl}" />
+                            <TextBlock FontSize="12" Text="{StaticResource ResourceKey=Ctrl}" />
                             <TextBlock
                                 FontSize="12"
                                 Foreground="{StaticResource MainColorFadedBrush}"
@@ -387,10 +362,7 @@
                             HorizontalAlignment="Center"
                             VerticalAlignment="Center"
                             Orientation="Horizontal">
-                            <TextBlock
-                                d:Text="Ctrl"
-                                FontSize="12"
-                                Text="{StaticResource ResourceKey=Ctrl}" />
+                            <TextBlock FontSize="12" Text="{StaticResource ResourceKey=Ctrl}" />
                             <TextBlock
                                 FontSize="12"
                                 Foreground="{StaticResource MainColorFadedBrush}"
@@ -411,7 +383,6 @@
                         BorderThickness="1,0,1,0">
                         <TextBlock
                             Margin="10,3,0,3"
-                            d:Text="Last image"
                             FontSize="12"
                             Text="{StaticResource ResourceKey=LastImage}" />
                     </Border>
@@ -427,10 +398,7 @@
                             HorizontalAlignment="Center"
                             VerticalAlignment="Center"
                             Orientation="Horizontal">
-                            <TextBlock
-                                d:Text="Ctrl"
-                                FontSize="12"
-                                Text="{StaticResource ResourceKey=Ctrl}" />
+                            <TextBlock FontSize="12" Text="{StaticResource ResourceKey=Ctrl}" />
                             <TextBlock
                                 FontSize="12"
                                 Foreground="{StaticResource MainColorFadedBrush}"
@@ -450,10 +418,7 @@
                             HorizontalAlignment="Center"
                             VerticalAlignment="Center"
                             Orientation="Horizontal">
-                            <TextBlock
-                                d:Text="Ctrl"
-                                FontSize="12"
-                                Text="{StaticResource ResourceKey=Ctrl}" />
+                            <TextBlock FontSize="12" Text="{StaticResource ResourceKey=Ctrl}" />
                             <TextBlock
                                 FontSize="12"
                                 Foreground="{StaticResource MainColorFadedBrush}"
@@ -474,7 +439,6 @@
                         BorderThickness="1,1,1,1">
                         <TextBlock
                             Margin="10,3,0,3"
-                            d:Text="Toggle looping"
                             FontSize="12"
                             Text="{StaticResource ResourceKey=ToggleLooping}" />
                     </Border>
@@ -537,7 +501,6 @@
                         BorderThickness="1,1,1,0">
                         <TextBlock
                             Margin="10,3,0,3"
-                            d:Text="Rotate right"
                             FontSize="12"
                             Text="{StaticResource ResourceKey=RotateRight}" />
                     </Border>
@@ -579,7 +542,6 @@
                         BorderThickness="1,1,1,1">
                         <TextBlock
                             Margin="10,3,0,3"
-                            d:Text="Rotate left"
                             FontSize="12"
                             Text="{StaticResource ResourceKey=RotateLeft}" />
                     </Border>
@@ -621,7 +583,6 @@
                         BorderThickness="1,0,1,1">
                         <TextBlock
                             Margin="10,3,0,3"
-                            d:Text="Flip"
                             FontSize="12"
                             Text="{StaticResource ResourceKey=Flip}" />
                     </Border>
@@ -707,10 +668,7 @@
                             HorizontalAlignment="Center"
                             VerticalAlignment="Center"
                             Orientation="Horizontal">
-                            <TextBlock
-                                d:Text="Ctrl"
-                                FontSize="12"
-                                Text="{StaticResource ResourceKey=Ctrl}" />
+                            <TextBlock FontSize="12" Text="{StaticResource ResourceKey=Ctrl}" />
                             <TextBlock
                                 FontSize="12"
                                 Foreground="{StaticResource MainColorFadedBrush}"
@@ -1451,10 +1409,7 @@
                             HorizontalAlignment="Center"
                             VerticalAlignment="Center"
                             Orientation="Horizontal">
-                            <TextBlock
-                                d:Text="Ctrl"
-                                FontSize="12"
-                                Text="{StaticResource ResourceKey=Ctrl}" />
+                            <TextBlock FontSize="12" Text="{StaticResource ResourceKey=Ctrl}" />
                             <TextBlock
                                 FontSize="12"
                                 Foreground="{StaticResource MainColorFadedBrush}"
@@ -1502,10 +1457,7 @@
                             HorizontalAlignment="Center"
                             VerticalAlignment="Center"
                             Orientation="Horizontal">
-                            <TextBlock
-                                d:Text="Ctrl"
-                                FontSize="12"
-                                Text="{StaticResource ResourceKey=Ctrl}" />
+                            <TextBlock FontSize="12" Text="{StaticResource ResourceKey=Ctrl}" />
                             <TextBlock
                                 FontSize="12"
                                 Foreground="{StaticResource MainColorFadedBrush}"
@@ -1615,10 +1567,7 @@
                             VerticalAlignment="Center"
                             Orientation="Horizontal"
                             ToolTip="{StaticResource ResourceKey=DragFileTo}">
-                            <TextBlock
-                                d:Text="Ctrl"
-                                FontSize="12"
-                                Text="{StaticResource ResourceKey=Ctrl}" />
+                            <TextBlock FontSize="12" Text="{StaticResource ResourceKey=Ctrl}" />
                             <TextBlock
                                 FontSize="12"
                                 Foreground="{StaticResource MainColorFadedBrush}"
@@ -1701,10 +1650,7 @@
                             HorizontalAlignment="Center"
                             VerticalAlignment="Center"
                             Orientation="Horizontal">
-                            <TextBlock
-                                d:Text="Ctrl"
-                                FontSize="12"
-                                Text="{StaticResource ResourceKey=Ctrl}" />
+                            <TextBlock FontSize="12" Text="{StaticResource ResourceKey=Ctrl}" />
                             <TextBlock
                                 FontSize="12"
                                 Foreground="{StaticResource MainColorFadedBrush}"
@@ -1869,10 +1815,7 @@
                             HorizontalAlignment="Center"
                             VerticalAlignment="Center"
                             Orientation="Horizontal">
-                            <TextBlock
-                                d:Text="Ctrl"
-                                FontSize="12"
-                                Text="{StaticResource ResourceKey=Ctrl}" />
+                            <TextBlock FontSize="12" Text="{StaticResource ResourceKey=Ctrl}" />
                             <TextBlock
                                 FontSize="12"
                                 Foreground="{StaticResource MainColorFadedBrush}"
@@ -2062,10 +2005,7 @@
                             VerticalAlignment="Center"
                             Orientation="Horizontal"
                             ToolTip="{StaticResource ResourceKey=CloseApp}">
-                            <TextBlock
-                                d:Text="Ctrl"
-                                FontSize="12"
-                                Text="{StaticResource ResourceKey=Ctrl}" />
+                            <TextBlock FontSize="12" Text="{StaticResource ResourceKey=Ctrl}" />
                             <TextBlock
                                 FontSize="12"
                                 Foreground="{StaticResource MainColorFadedBrush}"
@@ -2358,10 +2298,7 @@
                             HorizontalAlignment="Center"
                             VerticalAlignment="Center"
                             Orientation="Horizontal">
-                            <TextBlock
-                                d:Text="Ctrl"
-                                FontSize="12"
-                                Text="{StaticResource ResourceKey=Ctrl}" />
+                            <TextBlock FontSize="12" Text="{StaticResource ResourceKey=Ctrl}" />
                             <TextBlock
                                 FontSize="12"
                                 Foreground="{StaticResource MainColorFadedBrush}"

PicView/Views/Windows/InfoWindow.xaml.cs

@@ -104,7 +104,7 @@ namespace PicView.Views.Windows
 
             KeyDown += (_, e) => Shortcuts.GenericWindowShortcuts.KeysDown(Scroller, e, this);
             Scroller.MouseWheel += (_, e) => Shortcuts.GenericWindowShortcuts.Window_MouseWheel(Scroller, e);
-            Bar.MouseLeftButtonDown += (_, _) => DragMove();
+            TitleBar.MouseLeftButtonDown += (_, _) => DragMove();
 
             CloseButton.TheButton.Click += delegate { Hide(); };
             MinButton.TheButton.Click += delegate { SystemCommands.MinimizeWindow(this); };