|
669 | 669 | <Setter Property="Background" Value="Transparent"/> |
670 | 670 | </Style> |
671 | 671 | <Style Selector="ListBoxItem:selected Border.compCell"> |
672 | | - <Setter Property="BorderBrush" Value="#89b4fa"/> |
| 672 | + <Setter Property="BorderBrush" Value="#a6e3a1"/> |
673 | 673 | </Style> |
674 | 674 | </ListBox.Styles> |
675 | 675 | <ListBox.ItemTemplate> |
|
1639 | 1639 | <Border Grid.Column="1" Background="#181825" CornerRadius="8" Margin="0,0,6,0" Padding="0" |
1640 | 1640 | IsVisible="{Binding Palette, Converter={x:Static ObjectConverters.IsNotNull}}" |
1641 | 1641 | x:DataType="vm:MainWindowViewModel"> |
1642 | | - <Grid RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,*" DataContext="{Binding Palette}" |
| 1642 | + <Grid RowDefinitions="Auto,Auto,Auto,Auto,Auto,*" DataContext="{Binding Palette}" |
1643 | 1643 | x:DataType="vm:PaletteViewModel" Margin="6,8,6,6"> |
1644 | 1644 |
|
1645 | 1645 | <!-- Row 0: Collection selector --> |
|
1857 | 1857 | </DockPanel> |
1858 | 1858 | </Border> |
1859 | 1859 |
|
1860 | | - <!-- Row 5: Custom brushes --> |
1861 | | - <Border Grid.Row="5" Background="#11111b" CornerRadius="4" Padding="4,3" Margin="0,0,0,4"> |
1862 | | - <DockPanel> |
1863 | | - <TextBlock DockPanel.Dock="Left" Text="Brush" FontSize="9" Foreground="#585b70" |
1864 | | - VerticalAlignment="Center" Margin="0,0,6,0"/> |
1865 | | - <Button DockPanel.Dock="Right" Classes="toolbar" Padding="4,2" Margin="2,0,0,0" |
1866 | | - ToolTip.Tip="New Brush" Command="{Binding AddBrushCommand}"> |
1867 | | - <i:Icon Value="fa-solid fa-plus" FontSize="9"/> |
1868 | | - </Button> |
1869 | | - <Button DockPanel.Dock="Right" Classes="toolbar" Padding="4,2" Margin="2,0,0,0" |
1870 | | - ToolTip.Tip="Delete Brush" |
1871 | | - Command="{Binding RemoveBrushCommand}" |
1872 | | - CommandParameter="{Binding SelectedBrush}"> |
1873 | | - <i:Icon Value="fa-solid fa-trash" FontSize="9" Foreground="#f38ba8"/> |
1874 | | - </Button> |
1875 | | - <Button DockPanel.Dock="Right" Classes="toolbar" Padding="4,2" Margin="2,0,0,0" |
1876 | | - ToolTip.Tip="Edit Brush Items" |
1877 | | - Command="{Binding EditBrushCommand}"> |
1878 | | - <i:Icon Value="fa-solid fa-pen" FontSize="9"/> |
1879 | | - </Button> |
1880 | | - <Button DockPanel.Dock="Right" Classes="toolbar" Padding="4,2" Margin="2,0,0,0" |
1881 | | - ToolTip.Tip="Rename Brush" |
1882 | | - Command="{Binding SelectedBrush.BeginRenameCommand}"> |
1883 | | - <i:Icon Value="fa-solid fa-i-cursor" FontSize="9"/> |
1884 | | - </Button> |
1885 | | - <Panel> |
1886 | | - <ComboBox ItemsSource="{Binding CustomBrushes}" |
1887 | | - SelectedItem="{Binding SelectedBrush}" |
1888 | | - IsVisible="{Binding SelectedBrush.IsRenaming, Converter={x:Static BoolConverters.Not}, FallbackValue=True}" |
1889 | | - FontSize="11" Padding="6,4" MinHeight="0" MaxHeight="28" |
1890 | | - Background="#1e1e2e" Foreground="#cdd6f4" BorderBrush="#313244" |
1891 | | - CornerRadius="4" HorizontalAlignment="Stretch"> |
1892 | | - <ComboBox.ItemTemplate> |
1893 | | - <DataTemplate x:DataType="vm:CustomBrushViewModel"> |
1894 | | - <StackPanel Orientation="Horizontal" Spacing="6"> |
1895 | | - <i:Icon Value="fa-solid fa-paintbrush" FontSize="9" Foreground="#f9e2af"/> |
1896 | | - <TextBlock Text="{Binding Name}" FontSize="11"/> |
1897 | | - <TextBlock Text="{Binding Items.Count, StringFormat='({0})'}" |
1898 | | - FontSize="9" Foreground="#585b70" VerticalAlignment="Center"/> |
1899 | | - </StackPanel> |
1900 | | - </DataTemplate> |
1901 | | - </ComboBox.ItemTemplate> |
1902 | | - </ComboBox> |
1903 | | - <TextBox IsVisible="{Binding SelectedBrush.IsRenaming, FallbackValue=False}" |
1904 | | - Text="{Binding SelectedBrush.RenameText, Mode=TwoWay}" |
1905 | | - FontSize="11" Padding="6,4" MinHeight="0" MaxHeight="28" |
1906 | | - Background="#11111b" Foreground="#cdd6f4" BorderBrush="#89b4fa" |
1907 | | - CornerRadius="4" HorizontalAlignment="Stretch" |
1908 | | - KeyDown="OnBrushRenameKeyDown"/> |
1909 | | - </Panel> |
1910 | | - </DockPanel> |
1911 | | - </Border> |
1912 | | - |
1913 | | - <!-- Row 6: Items grid (unified catalog + search) --> |
1914 | | - <Grid Grid.Row="6" RowDefinitions="Auto,*,Auto"> |
| 1860 | + <!-- Row 5: Items grid (unified catalog + search) --> |
| 1861 | + <Grid Grid.Row="5" RowDefinitions="Auto,*,Auto"> |
1915 | 1862 | <TextBox Grid.Row="0" Watermark="Search items..." |
1916 | 1863 | Text="{Binding CatalogSearchText}" FontSize="10" |
1917 | 1864 | Background="#11111b" Foreground="#cdd6f4" BorderBrush="#313244" |
|
1929 | 1876 | <Border Width="36" Height="36" Background="#313244" CornerRadius="3" Margin="1" |
1930 | 1877 | ToolTip.Tip="{Binding Tooltip}" Cursor="Hand" |
1931 | 1878 | BorderThickness="{Binding IsHighlighted, Converter={StaticResource BoolToHighlightThickness}}" |
1932 | | - BorderBrush="White" |
| 1879 | + BorderBrush="#a6e3a1" |
1933 | 1880 | DoubleTapped="OnCatalogItemDoubleTapped" |
1934 | 1881 | PointerPressed="OnCatalogItemPressed"> |
1935 | 1882 | <Border.ContextMenu> |
|
0 commit comments