Skip to content

Commit a82225e

Browse files
committed
Add shadow to Ribbon
1 parent eae2448 commit a82225e

9 files changed

+186
-476
lines changed

Files UWP/FilesUWP.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@
249249
<Version>5.1.0</Version>
250250
</PackageReference>
251251
<PackageReference Include="Microsoft.UI.Xaml">
252-
<Version>2.1.190405004.1</Version>
252+
<Version>2.1.190405004.2</Version>
253253
</PackageReference>
254254
</ItemGroup>
255255
<ItemGroup>

Files UWP/GenericFileBrowser.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@
176176
</MenuFlyout>
177177
</Grid.ContextFlyout>
178178
<ProgressBar Name="progBar" Height="10" VerticalAlignment="Top" IsIndeterminate="True"/>
179-
<TextBlock Name="EmptyText" HorizontalAlignment="Center" Text="This folder is empty." TextWrapping="Wrap" VerticalAlignment="Top" Margin="0,125,0,0"/>
179+
<TextBlock Name="EmptyText" HorizontalAlignment="Center" Text="This folder is empty." TextWrapping="Wrap" VerticalAlignment="Top" Margin="0,125,0,0"/>
180180
<controls:DataGrid RowDetailsVisibilityMode="Collapsed" AllowDrop="True" Drop="AllView_DropAsync" DragLeave="AllView_DragLeave" DragStarting="AllView_DragStarting" SelectionChanged="AllView_SelectionChanged" Margin="24,24,0,0" Grid.Row="3" CellEditEnded="AllView_CellEditEnded" FocusVisualPrimaryThickness="0" SelectionMode="Extended" IsDoubleTapEnabled="True" x:FieldModifier="public" x:Name="AllView" AutoGenerateColumns="False" CanDrag="True" DragOver="AllView_DragOver" IsRightTapEnabled="True" CanUserReorderColumns="False" IsReadOnly="True" HorizontalAlignment="Left">
181181
<controls:DataGrid.ColumnHeaderStyle>
182182
<Style TargetType="controlsprimitives:DataGridColumnHeader">

Files UWP/GenericFileBrowser.xaml.cs

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,19 @@ public GenericFileBrowser()
6161
CopyItem.Click += instanceInteraction.CopyItem_ClickAsync;
6262
AllView.RightTapped += instanceInteraction.AllView_RightTapped;
6363
AllView.DoubleTapped += instanceInteraction.List_ItemClick;
64+
ItemViewModel<GenericFileBrowser>.GetCurrentSelectedTabInstance<ProHome>().TextState.PropertyChanged += TextState_PropertyChanged;
65+
}
66+
67+
private void TextState_PropertyChanged(object sender, PropertyChangedEventArgs e)
68+
{
69+
if (ItemViewModel<GenericFileBrowser>.GetCurrentSelectedTabInstance<ProHome>().TextState.isVisible == Visibility.Visible)
70+
{
71+
emptyTextGFB.Visibility = Visibility.Visible;
72+
}
73+
else if (ItemViewModel<GenericFileBrowser>.GetCurrentSelectedTabInstance<ProHome>().TextState.isVisible == Visibility.Collapsed)
74+
{
75+
emptyTextGFB.Visibility = Visibility.Collapsed;
76+
}
6477
}
6578

6679
private void SelectAllAcceleratorDG_Invoked(Windows.UI.Xaml.Input.KeyboardAccelerator sender, Windows.UI.Xaml.Input.KeyboardAcceleratorInvokedEventArgs args)

Files UWP/InstanceTabsView.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
<ContentPresenter ContentTemplate="{TemplateBinding HeaderTemplate}" Content="{TemplateBinding Header}" Grid.ColumnSpan="6" Grid.Row="0"/>
9494
<ContentPresenter ContentTemplate="{TemplateBinding TabStartHeaderTemplate}" Content="{TemplateBinding TabStartHeader}" Grid.Column="0" Grid.Row="1"/>
9595
<ScrollViewer Padding="2.5,0,0,0" x:Name="ScrollViewer" AutomationProperties.AccessibilityView="Raw" BringIntoViewOnFocusChange="{TemplateBinding ScrollViewer.BringIntoViewOnFocusChange}" Grid.Column="1" HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}" HorizontalScrollMode="{TemplateBinding ScrollViewer.HorizontalScrollMode}" IsDeferredScrollingEnabled="{TemplateBinding ScrollViewer.IsDeferredScrollingEnabled}" IsVerticalScrollChainingEnabled="{TemplateBinding ScrollViewer.IsVerticalScrollChainingEnabled}" IsHorizontalRailEnabled="{TemplateBinding ScrollViewer.IsHorizontalRailEnabled}" IsVerticalRailEnabled="{TemplateBinding ScrollViewer.IsVerticalRailEnabled}" IsHorizontalScrollChainingEnabled="{TemplateBinding ScrollViewer.IsHorizontalScrollChainingEnabled}" Grid.Row="1" Style="{StaticResource TabViewScrollViewer}" TabNavigation="{TemplateBinding TabNavigation}" VerticalScrollMode="{TemplateBinding ScrollViewer.VerticalScrollMode}" VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}" ZoomMode="{TemplateBinding ScrollViewer.ZoomMode}">
96-
<ItemsPresenter x:Name="TabsItemsPresenter" Padding="{TemplateBinding Padding}"/>
96+
<ItemsPresenter Canvas.ZIndex="2" x:Name="TabsItemsPresenter" Padding="{TemplateBinding Padding}"/>
9797
</ScrollViewer>
9898
<ContentPresenter ContentTemplate="{TemplateBinding TabActionHeaderTemplate}" Content="{TemplateBinding TabActionHeader}" Grid.Column="3" HorizontalAlignment="Left" Grid.Row="1"/>
9999
<Grid Background="Transparent" Name="DragArea" Loaded="DragArea_Loaded" Grid.Column="4" Grid.Row="1"/>

Files UWP/InstanceTabsView.xaml.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,8 @@ public void AddNewTab(Type t, string path)
8989
Header = TabLocationHeader,
9090
Content = gr,
9191
CornerRadius = new CornerRadius(15),
92-
Width = 200
92+
Width = 200,
93+
BorderThickness = new Thickness(0)
9394
};
9495
tvi.Loaded += Tvi_Loaded;
9596
TabStrip.Items.Add(tvi);
@@ -121,7 +122,7 @@ private void TabStrip_SelectionChanged(object sender, SelectionChangedEventArgs
121122

122123
private void TabStrip_TabClosing(object sender, TabClosingEventArgs e)
123124
{
124-
if(TabStrip.Items.Count == 0)
125+
if(TabStrip.Items.Count == 1)
125126
{
126127
AddNewTab(typeof(ProHome), null);
127128
}

Files UWP/PhotoAlbum.xaml.cs

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,20 @@ public PhotoAlbum()
4747
instanceViewModel = new ItemViewModel<PhotoAlbum>(this, null);
4848
instanceInteraction = new Interaction<PhotoAlbum>(this);
4949
gv.ItemsSource = instanceViewModel.FilesAndFolders;
50+
ItemViewModel<PhotoAlbum>.GetCurrentSelectedTabInstance<ProHome>().TextState.PropertyChanged += TextState_PropertyChanged;
5051
}
5152

52-
53+
private void TextState_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
54+
{
55+
if (ItemViewModel<PhotoAlbum>.GetCurrentSelectedTabInstance<ProHome>().TextState.isVisible == Visibility.Visible)
56+
{
57+
EmptyTextPA.Visibility = Visibility.Visible;
58+
}
59+
else if (ItemViewModel<PhotoAlbum>.GetCurrentSelectedTabInstance<ProHome>().TextState.isVisible == Visibility.Collapsed)
60+
{
61+
EmptyTextPA.Visibility = Visibility.Collapsed;
62+
}
63+
}
5364

5465
protected override void OnNavigatedTo(NavigationEventArgs eventArgs)
5566
{

0 commit comments

Comments
 (0)