|
110 | 110 | <Border Style="{DynamicResource SettingGroupBox}">
|
111 | 111 | <ItemsControl Style="{StaticResource SettingGrid}">
|
112 | 112 | <StackPanel Style="{StaticResource TextPanel}">
|
113 |
| - <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="Icon theme" /> |
| 113 | + <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="Icon color theme" /> |
114 | 114 | </StackPanel>
|
115 | 115 | <ComboBox
|
116 | 116 | Grid.Column="2"
|
117 |
| - Width="100" |
| 117 | + Width="130" |
118 | 118 | Margin="10,0,18,0"
|
119 | 119 | HorizontalContentAlignment="Center"
|
120 | 120 | ItemsSource="{Binding IconThemes}"
|
|
123 | 123 | <ComboBox.ItemTemplate>
|
124 | 124 | <DataTemplate DataType="{x:Type vm:IconThemeViewModel}">
|
125 | 125 | <StackPanel Orientation="Horizontal" ToolTip="{Binding Tooltip}">
|
126 |
| - <Image |
127 |
| - x:Name="ImageIcon" |
128 |
| - Width="32" |
129 |
| - UseLayoutRounding="True" |
130 |
| - SnapsToDevicePixels="True" |
131 |
| - Height="32" |
132 |
| - Source="{Binding ImageUri}" /> |
| 126 | + <Grid x:Name="GridImages"> |
| 127 | + <Image |
| 128 | + Width="32" |
| 129 | + UseLayoutRounding="True" |
| 130 | + SnapsToDevicePixels="True" |
| 131 | + Height="32" |
| 132 | + Source="{Binding ImageUri}" /> |
| 133 | + <Image |
| 134 | + Width="32" |
| 135 | + UseLayoutRounding="True" |
| 136 | + SnapsToDevicePixels="True" |
| 137 | + Height="32" |
| 138 | + Source="{Binding ImageUri2}"> |
| 139 | + <Image.Clip> |
| 140 | + <RectangleGeometry Rect="14,0,18,32"></RectangleGeometry> |
| 141 | + </Image.Clip> |
| 142 | + </Image> |
| 143 | + </Grid> |
133 | 144 | <TextBlock
|
134 |
| - x:Name="TextBlockIconTheme" |
135 | 145 | Margin="8,0,0,0"
|
136 | 146 | VerticalAlignment="Center"
|
137 |
| - Text="{Binding IconTheme}" /> |
| 147 | + Text="{Binding Name}" /> |
138 | 148 | </StackPanel>
|
139 | 149 | <DataTemplate.Triggers>
|
140 | 150 | <DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ComboBoxItem}}" Value="{x:Null}">
|
141 |
| - <Setter TargetName="ImageIcon" Property="Visibility" Value="Collapsed" /> |
| 151 | + <Setter TargetName="GridImages" Property="Visibility" Value="Collapsed" /> |
142 | 152 | </DataTrigger>
|
143 | 153 | </DataTemplate.Triggers>
|
144 | 154 | </DataTemplate>
|
|
158 | 168 | </StackPanel>
|
159 | 169 | <ComboBox
|
160 | 170 | Grid.Column="2"
|
161 |
| - Width="100" |
| 171 | + Width="130" |
162 | 172 | Margin="10,0,18,0"
|
163 | 173 | HorizontalContentAlignment="Center"
|
164 | 174 | ItemsSource="{Binding Source={StaticResource DefaultRecentCountOptions}}"
|
|
0 commit comments