From 33470d916cc4e2084fc6a314da72fc81cba237e1 Mon Sep 17 00:00:00 2001
From: 0x5bfa <62196528+0x5bfa@users.noreply.github.com>
Date: Mon, 24 Jun 2024 02:57:21 +0900
Subject: [PATCH 1/4] Init
---
src/Files.App/UserControls/TabBar/TabBar.xaml | 61 ++++++++++++++++++-
1 file changed, 59 insertions(+), 2 deletions(-)
diff --git a/src/Files.App/UserControls/TabBar/TabBar.xaml b/src/Files.App/UserControls/TabBar/TabBar.xaml
index 9e4cea87b1b0..2375802b6fec 100644
--- a/src/Files.App/UserControls/TabBar/TabBar.xaml
+++ b/src/Files.App/UserControls/TabBar/TabBar.xaml
@@ -58,13 +58,70 @@
-
+
+
+
+
+
+
+
+
+
+
-
+
From d2a6e4b8e00148910e7fc70c234d7bc41c6b7d3c Mon Sep 17 00:00:00 2001
From: 0x5BFA <62196528+0x5bfa@users.noreply.github.com>
Date: Tue, 25 Jun 2024 06:11:01 +0900
Subject: [PATCH 2/4] =?UTF-8?q?TabBar.xaml=20=E3=82=92=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Co-authored-by: Yair <39923744+yaira2@users.noreply.github.com>
---
src/Files.App/UserControls/TabBar/TabBar.xaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/Files.App/UserControls/TabBar/TabBar.xaml b/src/Files.App/UserControls/TabBar/TabBar.xaml
index 2375802b6fec..9128ec518bfb 100644
--- a/src/Files.App/UserControls/TabBar/TabBar.xaml
+++ b/src/Files.App/UserControls/TabBar/TabBar.xaml
@@ -66,7 +66,7 @@
Background="Transparent">
-
+
From 0c8d7a295861c6467e68a491d3356b4e2bf6913e Mon Sep 17 00:00:00 2001
From: Yair <39923744+yaira2@users.noreply.github.com>
Date: Mon, 24 Jun 2024 18:51:26 -0400
Subject: [PATCH 3/4] Commands
---
src/Files.App/Strings/en-US/Resources.resw | 3 +
.../UserControls/InnerNavigationToolbar.xaml | 61 -------
.../Menus/MenuFlyoutItemWithOpacityIcon.xaml | 151 ++++++++++++++++++
.../MenuFlyoutItemWithOpacityIcon.xaml.cs | 32 ++++
src/Files.App/UserControls/TabBar/TabBar.xaml | 87 +++++-----
5 files changed, 237 insertions(+), 97 deletions(-)
create mode 100644 src/Files.App/UserControls/Menus/MenuFlyoutItemWithOpacityIcon.xaml
create mode 100644 src/Files.App/UserControls/Menus/MenuFlyoutItemWithOpacityIcon.xaml.cs
diff --git a/src/Files.App/Strings/en-US/Resources.resw b/src/Files.App/Strings/en-US/Resources.resw
index 3bdf4c4dca4d..0710f389ca04 100644
--- a/src/Files.App/Strings/en-US/Resources.resw
+++ b/src/Files.App/Strings/en-US/Resources.resw
@@ -3866,4 +3866,7 @@
Show Toolbar
Setting that controls if the Toolbar is shown in the main view
+
+ Tab actions menu
+
\ No newline at end of file
diff --git a/src/Files.App/UserControls/InnerNavigationToolbar.xaml b/src/Files.App/UserControls/InnerNavigationToolbar.xaml
index eb7955682de1..0cca9fbbeb6e 100644
--- a/src/Files.App/UserControls/InnerNavigationToolbar.xaml
+++ b/src/Files.App/UserControls/InnerNavigationToolbar.xaml
@@ -1215,67 +1215,6 @@
Visibility="{x:Bind ShowPreviewPaneButton, Mode=OneWay}">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/Files.App/UserControls/Menus/MenuFlyoutItemWithOpacityIcon.xaml b/src/Files.App/UserControls/Menus/MenuFlyoutItemWithOpacityIcon.xaml
new file mode 100644
index 000000000000..75cd73c6a0a6
--- /dev/null
+++ b/src/Files.App/UserControls/Menus/MenuFlyoutItemWithOpacityIcon.xaml
@@ -0,0 +1,151 @@
+
+
+
+
+
+
+
diff --git a/src/Files.App/UserControls/Menus/MenuFlyoutItemWithOpacityIcon.xaml.cs b/src/Files.App/UserControls/Menus/MenuFlyoutItemWithOpacityIcon.xaml.cs
new file mode 100644
index 000000000000..64144a5e5d46
--- /dev/null
+++ b/src/Files.App/UserControls/Menus/MenuFlyoutItemWithOpacityIcon.xaml.cs
@@ -0,0 +1,32 @@
+// Copyright (c) 2024 Files Community
+// Licensed under the MIT License. See the LICENSE.
+
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+
+// The User Control element template is documented at https://go.microsoft.com/fwlink/?LinkId=234236
+
+namespace Files.App.UserControls
+{
+ public sealed partial class MenuFlyoutItemWithOpacityIcon: MenuFlyoutItem
+ {
+ public Style OpacityStyle
+ {
+ get { return (Style)GetValue(OpacityStyleProperty); }
+ set { SetValue(OpacityStyleProperty, value); }
+ }
+
+ public static readonly DependencyProperty OpacityStyleProperty =
+ DependencyProperty.Register("OpacityStyle", typeof(Style), typeof(MenuFlyoutItemWithOpacityIcon), new PropertyMetadata(null, OnOpacityStyleChanged));
+
+ private static void OnOpacityStyleChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+ {
+ (d as MenuFlyoutItem).Icon = e.NewValue is not null ? new IconSourceElement() : null;
+ }
+
+ public MenuFlyoutItemWithOpacityIcon()
+ {
+ InitializeComponent();
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/Files.App/UserControls/TabBar/TabBar.xaml b/src/Files.App/UserControls/TabBar/TabBar.xaml
index 9128ec518bfb..a24fb5ba22e0 100644
--- a/src/Files.App/UserControls/TabBar/TabBar.xaml
+++ b/src/Files.App/UserControls/TabBar/TabBar.xaml
@@ -8,6 +8,7 @@
xmlns:local="using:Files.App.UserControls.TabBar"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:root="using:Files.App"
+ xmlns:usercontrols="using:Files.App.UserControls"
mc:Ignorable="d">
@@ -71,49 +72,63 @@
From 486e844f3053ac30f9963ab6e737e8d64c76a118 Mon Sep 17 00:00:00 2001
From: Yair <39923744+yaira2@users.noreply.github.com>
Date: Mon, 24 Jun 2024 22:21:46 -0400
Subject: [PATCH 4/4] Update TabBar.xaml
---
src/Files.App/UserControls/TabBar/TabBar.xaml | 123 +++++++++---------
1 file changed, 62 insertions(+), 61 deletions(-)
diff --git a/src/Files.App/UserControls/TabBar/TabBar.xaml b/src/Files.App/UserControls/TabBar/TabBar.xaml
index a24fb5ba22e0..cb3c30ce1c62 100644
--- a/src/Files.App/UserControls/TabBar/TabBar.xaml
+++ b/src/Files.App/UserControls/TabBar/TabBar.xaml
@@ -71,67 +71,68 @@
-
+
+
+