Skip to content

Commit 4d89699

Browse files
TectorsTectors
committed
Explorer Work
1 parent 27f75a8 commit 4d89699

File tree

8 files changed

+27
-23
lines changed

8 files changed

+27
-23
lines changed

‎Source/vj0/Application/AppInstance.axaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,8 @@
184184
<Thickness x:Key="ComboBoxDropdownBorderPadding">0</Thickness>
185185
<Thickness x:Key="ComboBoxDropdownContentMargin">0</Thickness>
186186
<Thickness x:Key="FrameBorderThickness">1 1 0 0</Thickness>
187+
188+
<Thickness x:Key="FrameBorderMargin">0 0 10 10</Thickness>
187189

188190
<!-- ToggleButton Brushes -->
189191
<SolidColorBrush x:Key="ToggleButtonBackground" Color="Transparent"/>

‎Source/vj0/Controls/Navigation/NavigationFrame.axaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@
99
<Border
1010
x:Name="ContentBorder"
1111
ClipToBounds="True"
12-
BorderThickness="{DynamicResource FrameBorderThickness}"
13-
CornerRadius="12 0 0 0"
12+
BorderThickness="1"
13+
CornerRadius="12"
14+
Margin="{DynamicResource FrameBorderMargin}"
1415
BorderBrush="{DynamicResource BorderBrush}"
1516
Background="{DynamicResource PanelBackgroundBrush}"
1617
HorizontalAlignment="Stretch"

‎Source/vj0/Models/Files/TreeItem.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,9 @@ public IBrush GetItemBrush()
4545
return Name switch
4646
{
4747
"Engine" => new SolidColorBrush(Color.Parse("#e86c0e")),
48+
"Localization" => new SolidColorBrush(Color.Parse("#575757")),
49+
"Movies" => new SolidColorBrush(Color.Parse("#edde11")),
50+
"Weapons" => new SolidColorBrush(Color.Parse("#e3496a")),
4851
"Config" or "Slate" => new SolidColorBrush(Color.Parse("#6e6e6e")),
4952
"Plugins" => new SolidColorBrush(Color.Parse("#ff5959")),
5053
"Environments" => new SolidColorBrush(Color.Parse("#35fc46")),

‎Source/vj0/Styles/FluentAvalonia/ListBoxStyles.axaml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
<Setter Property="HorizontalContentAlignment" Value="Stretch" />
6868
<Setter Property="VerticalContentAlignment" Value="Center" />
6969
<Setter Property="MinWidth" Value="{DynamicResource ListViewItemMinWidth}" />
70-
<Setter Property="MinHeight" Value="25" />
70+
<Setter Property="MinHeight" Value="22" />
7171
<Setter Property="Template">
7272
<ControlTemplate>
7373
<Panel>
@@ -81,8 +81,7 @@
8181
Padding="{TemplateBinding Padding}"
8282
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
8383
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
84-
CornerRadius="{TemplateBinding CornerRadius}"
85-
Margin="0.7"/>
84+
CornerRadius="{TemplateBinding CornerRadius}"/>
8685

8786
<!--<Rectangle Name="SelectionIndicator"
8887
HorizontalAlignment="Left"

‎Source/vj0/Styles/FluentAvalonia/TextBoxStyles.axaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
<Style Selector="^:pointerover">
4848
<Style Selector="^ /template/ Border#ButtonLayoutGrid">
4949
<Setter Property="Background" Value="{DynamicResource TextControlButtonBackgroundPointerOver}" />
50-
<Setter Property="BorderBrush" Value="{DynamicResource TextControlButtonBorderBrushPointerOver}" />
50+
<Setter Property="BorderBrush" Value="#616161" />
5151
</Style>
5252

5353
<Style Selector="^ /template/ ui|SymbolIcon#Glyph">
@@ -99,7 +99,7 @@
9999
<Style Selector="^:pointerover">
100100
<Style Selector="^ /template/ Border#ButtonLayoutGrid">
101101
<Setter Property="Background" Value="{DynamicResource TextControlButtonBackgroundPointerOver}" />
102-
<Setter Property="BorderBrush" Value="{DynamicResource TextControlButtonBorderBrushPointerOver}" />
102+
<Setter Property="BorderBrush" Value="#616161" />
103103
</Style>
104104

105105
<Style Selector="^ /template/ ui|FontIcon#Glyph">
@@ -245,7 +245,7 @@
245245
<Setter Property="Foreground" Value="{DynamicResource TextControlForegroundPointerOver}" />
246246

247247
<Style Selector="^ /template/ Border#PART_BorderElement">
248-
<Setter Property="BorderBrush" Value="{DynamicResource TextControlBorderBrushPointerOver}"/>
248+
<Setter Property="BorderBrush" Value="#b3b3b3"/>
249249
<Setter Property="Background" Value="{DynamicResource TextControlBackgroundPointerOver}" />
250250
</Style>
251251

‎Source/vj0/Styles/FluentAvalonia/TreeViewStyles.axaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
<Setter Property="BorderBrush" Value="{DynamicResource TreeViewItemBorderBrush}"/>
9494
<Setter Property="BorderThickness" Value="1"/>
9595
<Setter Property="Foreground" Value="#a3a3a3"/>
96-
<Setter Property="MinHeight" Value="21"/>
96+
<Setter Property="MinHeight" Value="20"/>
9797
<Setter Property="VerticalAlignment" Value="Center"/>
9898
<Setter Property="CornerRadius" Value="5"/>
9999
<Setter Property="Template">
@@ -140,7 +140,7 @@
140140
HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
141141
VerticalAlignment="{TemplateBinding VerticalAlignment}"
142142
Margin="{TemplateBinding Padding}"
143-
Foreground="{Binding IsExpanded, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ForegroundExpandedConverter}}"/>
143+
Foreground="White"/>
144144
</Grid>
145145
</Panel>
146146
</Border>

‎Source/vj0/Views/ExplorerView.axaml‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,8 @@
2121
<Grid RowDefinitions="*">
2222
<Grid ColumnDefinitions="*,Auto,*">
2323
<Grid Grid.Column="0">
24-
<Grid.RowDefinitions>
25-
<RowDefinition Height="Auto"/>
26-
<RowDefinition Height="*"/>
27-
</Grid.RowDefinitions>
28-
2924
<!-- Folders -->
3025
<Border
31-
Grid.Row="1"
3226
BorderThickness="1"
3327
Background="#0d0d0d"
3428
ClipToBounds="True"
@@ -37,7 +31,9 @@
3731

3832
<Border.BorderBrush>
3933
<LinearGradientBrush StartPoint="0%,0%" EndPoint="100%,100%">
40-
<GradientStop Color="#1e1e1f" Offset="0" />
34+
<GradientStop Color="#2f2f30" Offset="0" />
35+
<GradientStop Color="#2e2e2e" Offset="0.5" />
36+
<GradientStop Color="#171717" Offset="1" />
4137
</LinearGradientBrush>
4238
</Border.BorderBrush>
4339

@@ -54,6 +50,7 @@
5450
<ControlTheme x:DataType="Explorer:TreeItem"
5551
TargetType="TreeViewItem"
5652
BasedOn="{StaticResource {x:Type TreeViewItem}}">
53+
5754
<Setter Property="IsExpanded" Value="{Binding Expanded, Mode=TwoWay}" />
5855
<Setter Property="IsSelected" Value="{Binding Selected, Mode=TwoWay}" />
5956
</ControlTheme>
@@ -131,7 +128,7 @@
131128
</StackPanel>
132129

133130
<Grid Grid.Row="1" Margin="3 2 10 10">
134-
<TextBox BorderBrush="#1e1e1f" MinWidth="0" Text="{Binding SearchFilter, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Watermark="Search"></TextBox>
131+
<TextBox BorderBrush="#2f2f30" MinWidth="0" Text="{Binding SearchFilter, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Watermark="Search"></TextBox>
135132
</Grid>
136133

137134
<Grid Grid.Row="2">
@@ -142,7 +139,9 @@
142139
CornerRadius="12">
143140
<Border.BorderBrush>
144141
<LinearGradientBrush StartPoint="0%,0%" EndPoint="100%,100%">
145-
<GradientStop Color="#1e1e1f" Offset="0" />
142+
<GradientStop Color="#2f2f30" Offset="0" />
143+
<GradientStop Color="#2e2e2e" Offset="0.5" />
144+
<GradientStop Color="#171717" Offset="1" />
146145
</LinearGradientBrush>
147146
</Border.BorderBrush>
148147

@@ -165,9 +164,9 @@
165164

166165
<ListBox.ItemTemplate>
167166
<DataTemplate DataType="Explorer:FileTile">
168-
<StackPanel Spacing="5" Margin="25 0 0 0"
167+
<StackPanel Spacing="5" Margin="10 0 0 0"
169168
Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Center">
170-
<fluent:FluentIcon Icon="Document" IconVariant="Filled" Foreground="#0e98e8"/>
169+
<fluent:FluentIcon FontSize="16" Icon="Document" IconVariant="Filled" Foreground="#0e98e8"/>
171170

172171
<TextBlock Text="{Binding NameWithoutExtension}"
173172
FontSize="14"
@@ -182,7 +181,7 @@
182181
</Border>
183182
</Grid>
184183

185-
<Grid Margin="0 0 10 5" Grid.Row="3" IsVisible="{Binding Source={x:Static framework:AppServices.Settings}, Path=Application.ShowDebugData}">
184+
<Grid Margin="0 -3 10 5" Grid.Row="3" IsVisible="{Binding Source={x:Static framework:AppServices.Settings}, Path=Application.ShowDebugData}">
186185
<Border
187186
BorderThickness="1"
188187
Background="#0a0a0a"

‎Source/vj0/Views/HomeView.axaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,6 @@
190190
</Grid>
191191
</navigation:NavigationFrame>
192192

193-
<Border Background="{DynamicResource BackgroundBrush}" HorizontalAlignment="Right" BorderThickness="1 0 0 1" BorderBrush="{DynamicResource BorderBrush}" CornerRadius="0 0 0 25" VerticalAlignment="Top" Width="90" Height="40"/>
193+
<Border Margin="0 0 10 0" Background="{DynamicResource BackgroundBrush}" HorizontalAlignment="Right" BorderThickness="1 0 0 1" BorderBrush="{DynamicResource BorderBrush}" CornerRadius="0 0 0 25" VerticalAlignment="Top" Width="90" Height="40"/>
194194
</Grid>
195195
</UserControl>

0 commit comments

Comments
 (0)