Skip to content

Commit 2498cd0

Browse files
lukeblevinslukeblevins
committed
Disable Ribbon Items Correctly
1 parent d65e2fd commit 2498cd0

File tree

6 files changed

+87
-98
lines changed

6 files changed

+87
-98
lines changed

‎Files UWP/Filesystem/ItemViewModel.cs

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,6 @@ public class ItemViewModel<PageType> where PageType : class
3333
public ReadOnlyObservableCollection<ListedItem> ClassicFileList { get; }
3434
public UniversalPath Universal { get; } = new UniversalPath();
3535

36-
37-
38-
public Interacts.Home.HomeItemsState HomeItems { get; set; } = new Interacts.Home.HomeItemsState();
39-
public Interacts.Share.ShareItemsState ShareItems { get; set; } = new Interacts.Share.ShareItemsState();
40-
public Interacts.Layout.LayoutItemsState LayoutItems { get; set; } = new Interacts.Layout.LayoutItemsState();
41-
public Interacts.AlwaysPresentCommandsState AlwaysPresentCommands { get; set; } = new Interacts.AlwaysPresentCommandsState();
42-
4336
private ObservableCollection<ListedItem> _filesAndFolders;
4437
private ObservableCollection<ListedItem> _classicFileList;
4538
private ObservableCollection<Classic_ListedFolderItem> _classicFolderList;
@@ -90,16 +83,16 @@ public ItemViewModel(PageType typeOfPage, Type pageTypeAlt)
9083
}
9184
}
9285
}
93-
94-
HomeItems.PropertyChanged += HomeItems_PropertyChanged;
95-
ShareItems.PropertyChanged += ShareItems_PropertyChanged;
96-
LayoutItems.PropertyChanged += LayoutItems_PropertyChanged;
97-
AlwaysPresentCommands.PropertyChanged += AlwaysPresentCommands_PropertyChanged;
86+
87+
GetCurrentSelectedTabInstance<ProHome>().HomeItems.PropertyChanged += HomeItems_PropertyChanged;
88+
GetCurrentSelectedTabInstance<ProHome>().ShareItems.PropertyChanged += ShareItems_PropertyChanged;
89+
GetCurrentSelectedTabInstance<ProHome>().LayoutItems.PropertyChanged += LayoutItems_PropertyChanged;
90+
GetCurrentSelectedTabInstance<ProHome>().AlwaysPresentCommands.PropertyChanged += AlwaysPresentCommands_PropertyChanged;
9891
}
9992

10093
private void AlwaysPresentCommands_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
10194
{
102-
if(AlwaysPresentCommands.isEnabled == true)
95+
if(GetCurrentSelectedTabInstance<ProHome>().AlwaysPresentCommands.isEnabled == true)
10396
{
10497
GetCurrentSelectedTabInstance<ProHome>().AlwaysPresentCommands.isEnabled = true;
10598
}
@@ -111,7 +104,7 @@ private void AlwaysPresentCommands_PropertyChanged(object sender, System.Compone
111104

112105
private void LayoutItems_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
113106
{
114-
if (LayoutItems.isEnabled == true)
107+
if (GetCurrentSelectedTabInstance<ProHome>().LayoutItems.isEnabled == true)
115108
{
116109
GetCurrentSelectedTabInstance<ProHome>().LayoutItems.isEnabled = true;
117110
}
@@ -123,7 +116,7 @@ private void LayoutItems_PropertyChanged(object sender, System.ComponentModel.Pr
123116

124117
private void ShareItems_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
125118
{
126-
if (ShareItems.isEnabled == true)
119+
if (GetCurrentSelectedTabInstance<ProHome>().ShareItems.isEnabled == true)
127120
{
128121
GetCurrentSelectedTabInstance<ProHome>().ShareItems.isEnabled = true;
129122
}
@@ -135,7 +128,7 @@ private void ShareItems_PropertyChanged(object sender, System.ComponentModel.Pro
135128

136129
private void HomeItems_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
137130
{
138-
if (HomeItems.isEnabled == true)
131+
if (GetCurrentSelectedTabInstance<ProHome>().HomeItems.isEnabled == true)
139132
{
140133
GetCurrentSelectedTabInstance<ProHome>().HomeItems.isEnabled = true;
141134
}

‎Files UWP/GenericFileBrowser.xaml.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ protected override void OnNavigatedTo(NavigationEventArgs eventArgs)
102102
CurrentInstance.ForwardButton.IsEnabled = CurrentInstance.accessibleContentFrame.CanGoForward;
103103
CurrentInstance.RefreshButton.IsEnabled = true;
104104
Clipboard_ContentChanged(null, null);
105-
instanceViewModel.AlwaysPresentCommands.isEnabled = true;
105+
CurrentInstance.AlwaysPresentCommands.isEnabled = true;
106106
var parameters = (string)eventArgs.Parameter;
107107
instanceViewModel.CancelLoadAndClearFiles();
108108
instanceViewModel.Universal.path = parameters;
@@ -227,8 +227,8 @@ private void ContentDialog_Loaded(object sender, RoutedEventArgs e)
227227
private void GenericItemView_PointerReleased(object sender, Windows.UI.Xaml.Input.PointerRoutedEventArgs e)
228228
{
229229
data.SelectedItem = null;
230-
instanceViewModel.HomeItems.isEnabled = false;
231-
instanceViewModel.ShareItems.isEnabled = false;
230+
ItemViewModel<GenericFileBrowser>.GetCurrentSelectedTabInstance<ProHome>().HomeItems.isEnabled = false;
231+
ItemViewModel<GenericFileBrowser>.GetCurrentSelectedTabInstance<ProHome>().ShareItems.isEnabled = false;
232232
}
233233

234234
private void AllView_SelectionChanged(object sender, SelectionChangedEventArgs e)
@@ -237,8 +237,8 @@ private void AllView_SelectionChanged(object sender, SelectionChangedEventArgs e
237237
AllView.CommitEdit();
238238
if(e.AddedItems.Count > 0)
239239
{
240-
instanceViewModel.HomeItems.isEnabled = true;
241-
instanceViewModel.ShareItems.isEnabled = true;
240+
ItemViewModel<GenericFileBrowser>.GetCurrentSelectedTabInstance<ProHome>().HomeItems.isEnabled = true;
241+
ItemViewModel<GenericFileBrowser>.GetCurrentSelectedTabInstance<ProHome>().ShareItems.isEnabled = true;
242242

243243
}
244244
}

‎Files UWP/PhotoAlbum.xaml.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ protected override void OnNavigatedTo(NavigationEventArgs eventArgs)
5858
CurrentInstance.BackButton.IsEnabled = CurrentInstance.accessibleContentFrame.CanGoBack;
5959
CurrentInstance.ForwardButton.IsEnabled = CurrentInstance.accessibleContentFrame.CanGoForward;
6060
CurrentInstance.RefreshButton.IsEnabled = true;
61-
instanceViewModel.AlwaysPresentCommands.isEnabled = true;
61+
ItemViewModel<PhotoAlbum>.GetCurrentSelectedTabInstance<ProHome>().AlwaysPresentCommands.isEnabled = true;
6262
var parameters = eventArgs.Parameter.ToString();
6363
instanceViewModel.AddItemsToCollectionAsync(parameters, this);
6464
TextState_PropertyChanged(null, null);
@@ -142,8 +142,8 @@ private void FileList_Tapped(object sender, Windows.UI.Xaml.Input.TappedRoutedEv
142142
private void PhotoAlbumViewer_PointerReleased(object sender, Windows.UI.Xaml.Input.PointerRoutedEventArgs e)
143143
{
144144
FileList.SelectedItem = null;
145-
instanceViewModel.HomeItems.isEnabled = false;
146-
instanceViewModel.ShareItems.isEnabled = false;
145+
ItemViewModel<PhotoAlbum>.GetCurrentSelectedTabInstance<ProHome>().HomeItems.isEnabled = false;
146+
ItemViewModel<PhotoAlbum>.GetCurrentSelectedTabInstance<ProHome>().ShareItems.isEnabled = false;
147147
}
148148

149149
private void PhotoAlbumViewer_RightTapped(object sender, Windows.UI.Xaml.Input.RightTappedRoutedEventArgs e)

‎Files UWP/ProHome.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -647,7 +647,7 @@
647647

648648
<StackPanel Margin="0,0,5,0" Grid.Column="2" Orientation="Horizontal">
649649
<TextBox Style="{StaticResource TextBoxStyleForPathBar}" Padding="5" Windows10version1809:CornerRadius="5,0,0,5" BorderThickness="1" Margin="0,5,0,5" VerticalAlignment="Stretch" PlaceholderText="Search" Width="260"/>
650-
<Button Width="35" BorderThickness="0" Margin="0,5,0,5.5" VerticalAlignment="Stretch" Windows10version1809:CornerRadius="0,5,5,0" Background="{StaticResource SystemAccentColor}">
650+
<Button BorderBrush="{StaticResource SystemAccentColor}" Width="35" BorderThickness="1" Margin="0,5,0,5.5" VerticalAlignment="Stretch" Windows10version1809:CornerRadius="0,5,5,0" Background="{StaticResource SystemAccentColor}">
651651
<FontIcon FontSize="12" Foreground="White" Glyph="&#xEBE7;"/>
652652
</Button>
653653
</StackPanel>

0 commit comments

Comments
 (0)