Skip to content

Commit 6206c6a

Browse files
committed
ux: remove unused styles
1 parent 1c204e7 commit 6206c6a

File tree

3 files changed

+14
-16
lines changed

3 files changed

+14
-16
lines changed

src/Resources/Styles.axaml

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1094,7 +1094,7 @@
10941094
</Style>
10951095
</Style>
10961096

1097-
<Style Selector="ToggleButton.change_tree_folder">
1097+
<Style Selector="ToggleButton.folder">
10981098
<Setter Property="Margin" Value="0" />
10991099
<Setter Property="Background" Value="Transparent"/>
11001100
<Setter Property="IsHitTestVisible" Value="False"/>
@@ -1106,9 +1106,8 @@
11061106
HorizontalAlignment="Left"
11071107
VerticalAlignment="Center">
11081108
<Path x:Name="ChevronPath"
1109-
Margin="0,2,0,0"
11101109
Data="{StaticResource Icons.Folder.Fill}"
1111-
Fill="Goldenrod"
1110+
Fill="{TemplateBinding Foreground}"
11121111
HorizontalAlignment="Center"
11131112
VerticalAlignment="Center"/>
11141113
</Border>
@@ -1292,12 +1291,6 @@
12921291
<Setter Property="Opacity" Value=".65"/>
12931292
</Style>
12941293
</Style>
1295-
<Style Selector="TreeViewItem[IsExpanded=True] Path.folder_icon">
1296-
<Setter Property="Data" Value="{StaticResource Icons.Folder.Open}"/>
1297-
</Style>
1298-
<Style Selector="TreeViewItem[IsExpanded=False] Path.folder_icon">
1299-
<Setter Property="Data" Value="{StaticResource Icons.Folder.Fill}"/>
1300-
</Style>
13011294

13021295
<Style Selector="NumericUpDown">
13031296
<Style Selector="^ /template/ ButtonSpinner#PART_Spinner">

src/Views/ChangeCollectionView.axaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,10 @@
4747
IsVisible="{Binding IsFolder}"/>
4848

4949
<ToggleButton Grid.Column="1"
50-
Classes="change_tree_folder"
50+
Classes="folder"
5151
Focusable="False"
5252
Width="14" Height="14"
53+
Foreground="Goldenrod"
5354
IsChecked="{Binding IsExpanded}"
5455
IsVisible="{Binding IsFolder}"/>
5556

src/Views/Welcome.axaml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -94,18 +94,22 @@
9494
PointerReleased="OnPointerReleasedOnTreeNode"
9595
DoubleTapped="OnDoubleTappedTreeNode"
9696
ClipToBounds="True">
97-
<Path Grid.Column="0" Width="12" Height="12" Margin="0,0,8,0"
97+
<Path Grid.Column="0" Width="12" Height="12" Margin="0,0,4,0"
9898
Fill="{Binding Bookmark, Converter={x:Static c:BookmarkConverters.ToBrush}}"
9999
StrokeThickness="{Binding Bookmark, Converter={x:Static c:BookmarkConverters.ToStrokeThickness}}"
100100
Stroke="{DynamicResource Brush.FG1}"
101101
HorizontalAlignment="Left"
102102
Data="{StaticResource Icons.Bookmark}"
103103
IsVisible="{Binding IsRepository}"/>
104-
<Path Grid.Column="0" Classes="folder_icon"
105-
Width="12" Height="12" Margin="0,2,8,0"
106-
Fill="{DynamicResource Brush.FG1}"
107-
HorizontalAlignment="Left"
108-
IsVisible="{Binding !IsRepository}"/>
104+
105+
<ToggleButton Grid.Column="0"
106+
Classes="folder"
107+
Focusable="False"
108+
Width="12" Height="12"
109+
Margin="0,0,4,0"
110+
Foreground="{DynamicResource Brush.FG1}"
111+
IsChecked="{Binding IsExpanded}"
112+
IsVisible="{Binding !IsRepository}"/>
109113

110114
<TextBlock Grid.Column="1" Classes="monospace" VerticalAlignment="Center" Text="{Binding Name}"/>
111115
<TextBlock Grid.Column="2"

0 commit comments

Comments
 (0)