Browse Source

Added border thickness on hover to ComboBoxItem and updated localization debug window combo box

CPKreuz 2 years ago
parent
commit
4d8926e991

+ 13 - 1
src/PixiEditor/Styles/ComboBoxDarkStyle.xaml

@@ -191,9 +191,21 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="ComboBoxItem">
-                    <Border Name="Bd" Background="{TemplateBinding Background}" BorderThickness="0">
+                    <Border Name="Bd" Background="{TemplateBinding Background}" BorderThickness="0,1">
                         <ContentPresenter Content="{TemplateBinding Content}" HorizontalAlignment="Stretch"
                                           VerticalAlignment="Center" Margin="4,2"/>
+                        
+                        <Border.Style>
+                            <Style TargetType="Border">
+                                <Setter Property="BorderBrush" Value="Transparent" />
+                                <Style.Triggers>
+                                    <Trigger Property="IsMouseOver" Value="True">
+                                        <Setter Property="BorderBrush" Value="{StaticResource AlmostLightModeAccentColor}" />
+                                    </Trigger>
+                                </Style.Triggers>
+                            </Style>
+
+                        </Border.Style>
                     </Border>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsHighlighted" Value="True">

+ 24 - 1
src/PixiEditor/Views/Dialogs/DebugDialogs/Localization/LocalizationDebugWindow.xaml

@@ -100,7 +100,7 @@
                                                              VerticalAlignment="Center"
                                                              Fill="{Binding StatusBrush}"
                                                              Margin="0,0,5,0" />
-                                                    <TextBlock>
+                                                    <TextBlock VerticalAlignment="Center">
                                                         <Run Text="{Binding Name}"/>
                                                         <Run Text="{Binding Code, StringFormat='(\{0\})'}"/>
                                                     </TextBlock>
@@ -108,6 +108,29 @@
                                             </DataTemplate>
                                         </Setter.Value>
                                     </Setter>
+                                    <Setter Property="Template">
+                                        <Setter.Value>
+                                            <ControlTemplate TargetType="{x:Type ComboBoxItem}">
+                                                <Border Height="25" Margin="0" Padding="5,0" BorderThickness="0,1">
+                                                    <ContentPresenter/>
+                                                    <Border.Style>
+                                                        <Style TargetType="{x:Type Border}">
+                                                            <Style.Triggers>
+                                                                <Trigger Property="IsMouseOver" Value="False">
+                                                                    <Setter Property="Background" Value="Transparent"/>
+                                                                    <Setter Property="BorderBrush" Value="Transparent"/>
+                                                                </Trigger>
+                                                                <Trigger Property="IsMouseOver" Value="True">
+                                                                    <Setter Property="Background" Value="{StaticResource MainColor}"/>
+                                                                    <Setter Property="BorderBrush" Value="{StaticResource AlmostLightModeAccentColor}"/>
+                                                                </Trigger>
+                                                            </Style.Triggers>
+                                                        </Style>
+                                                    </Border.Style>
+                                                </Border>
+                                            </ControlTemplate>
+                                        </Setter.Value>
+                                    </Setter>
                                 </Style>
                             </ComboBox.ItemContainerStyle>
                         </ComboBox>

+ 3 - 1
src/PixiEditor/Views/Dialogs/SettingsWindow.xaml

@@ -83,16 +83,18 @@
                             <Setter Property="Template">
                                 <Setter.Value>
                                     <ControlTemplate TargetType="{x:Type ComboBoxItem}">
-                                        <Border Height="25" Margin="0" Padding="5,0">
+                                        <Border Height="25" Margin="0" Padding="5,0" BorderThickness="0,1">
                                             <ContentPresenter/>
                                             <Border.Style>
                                                 <Style TargetType="{x:Type Border}">
                                                     <Style.Triggers>
                                                         <Trigger Property="IsMouseOver" Value="False">
                                                             <Setter Property="Background" Value="Transparent"/>
+                                                            <Setter Property="BorderBrush" Value="Transparent"/>
                                                         </Trigger>
                                                         <Trigger Property="IsMouseOver" Value="True">
                                                             <Setter Property="Background" Value="{StaticResource MainColor}"/>
+                                                            <Setter Property="BorderBrush" Value="{StaticResource AlmostLightModeAccentColor}"/>
                                                         </Trigger>
                                                     </Style.Triggers>
                                                 </Style>