Ruben 4 лет назад
Родитель
Сommit
42488102ce

+ 3 - 3
PicView/Themes/Styles/TextBox.xaml

@@ -20,7 +20,7 @@
                         Background="{TemplateBinding Background}"
                         BorderBrush="{TemplateBinding BorderBrush}"
                         BorderThickness="{TemplateBinding BorderThickness}"
-                        CornerRadius="0"
+                        CornerRadius="2"
                         SnapsToDevicePixels="True">
                         <ScrollViewer
                             x:Name="PART_ContentHost"
@@ -32,7 +32,7 @@
                         <Trigger Property="IsEnabled" Value="False">
                             <Setter TargetName="border" Property="Opacity" Value="0.56" />
                         </Trigger>
-                        
+
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
                                 <Condition Property="IsReadOnly" Value="False" />
@@ -58,7 +58,7 @@
                         </Trigger>
 
                         <Trigger Property="IsReadOnly" Value="True">
-                            <Setter TargetName="border" Property="Background" Value="{StaticResource BackgroundColorBrush}"  />
+                            <Setter TargetName="border" Property="Background" Value="{StaticResource BackgroundColorBrush}" />
                         </Trigger>
 
                         <Trigger Property="IsReadOnly" Value="False">

+ 1 - 1
PicView/Views/UserControls/Menus/ToolsAndEffectsMenu.xaml

@@ -99,7 +99,7 @@
                                 </Image>
 
                                 <Image
-                                    Canvas.Left="27"
+                                    Canvas.Left="26"
                                     Canvas.Top="21"
                                     Height="10"
                                     Panel.ZIndex="-2"

+ 13 - 11
PicView/Views/UserControls/Misc/TextboxInfo.xaml

@@ -1,21 +1,22 @@
-<UserControl x:Class="PicView.Views.UserControls.TextboxInfo"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             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:uc="clr-namespace:PicView.Views.UserControls"
-             mc:Ignorable="d" 
-             Margin="10,10,10,0">
+<UserControl
+    x:Class="PicView.Views.UserControls.TextboxInfo"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:uc="clr-namespace:PicView.Views.UserControls"
+    Margin="10,10,10,0"
+    mc:Ignorable="d">
     <StackPanel Orientation="Horizontal">
         <TextBlock
             x:Name="ValueName"
             Width="130"
             Margin="0,0,10,0"
             VerticalAlignment="Center"
+            d:Text="{StaticResource FileName}"
             FontFamily="/PicView;component/Themes/Resources/fonts/#Roboto Bold"
-            Foreground="{StaticResource MainColorBrush}"
             FontSize="14"
-            d:Text="{StaticResource FileName}"
+            Foreground="{StaticResource MainColorBrush}"
             TextTrimming="CharacterEllipsis"
             ToolTip="{Binding RelativeSource={RelativeSource Self}, Path=Text}" />
         <TextBox
@@ -28,7 +29,8 @@
             Height="35"
             Margin="10,0,0,0"
             BorderBrush="{StaticResource BorderBrush}"
-            BorderThickness="1">
+            BorderThickness="1"
+            CornerRadius="2">
             <uc:CopyButton x:Name="ValueCopy" ToolTip="{StaticResource Copy}" />
         </Border>
     </StackPanel>