From 925381b33a7eeb43f0c4f03948c33d78264f1179 Mon Sep 17 00:00:00 2001
From: Yair Aichenbaum <39923744+yaichenbaum@users.noreply.github.com>
Date: Mon, 16 Nov 2020 17:37:16 -0500
Subject: [PATCH 1/3] Added the option to open a new tab to the
 HorizontalMultitaskingControl right click context menu.

---
 .../HorizontalMultitaskingControl.xaml            | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/Files/UserControls/MultitaskingControl/HorizontalMultitaskingControl.xaml b/Files/UserControls/MultitaskingControl/HorizontalMultitaskingControl.xaml
index d3b9587796d7..827e3f34bbc2 100644
--- a/Files/UserControls/MultitaskingControl/HorizontalMultitaskingControl.xaml
+++ b/Files/UserControls/MultitaskingControl/HorizontalMultitaskingControl.xaml
@@ -10,14 +10,26 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
     xmlns:primitives="using:Microsoft.UI.Xaml.Controls.Primitives"
+    xmlns:views="using:Files.Views"
     d:DesignHeight="300"
     d:DesignWidth="400"
     mc:Ignorable="d">
     <UserControl.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary>
+                    <MenuFlyout x:Key="TabFlyout">
+                        <MenuFlyoutItem
+                            x:Uid="NavigationToolbarNewTab"
+                            Click="{x:Bind views:MainPage.AddNewTab}"
+                            Text="New tab">
+                            <MenuFlyoutItem.Icon>
+                                <FontIcon FontFamily="{StaticResource CustomGlyph}" Glyph="&#xF104;" />
+                            </MenuFlyoutItem.Icon>
+                        </MenuFlyoutItem>
+                    </MenuFlyout>
+                </ResourceDictionary>
                 <ResourceDictionary Source="/ResourceDictionaries/TabView_themeresources.xaml" />
-
                 <ResourceDictionary>
                     <Style x:Key="DefaultTabViewStyle" TargetType="muxc:TabView">
                         <Setter Property="VerticalAlignment" Value="Top" />
@@ -795,6 +807,7 @@
                     <muxc:TabViewItem
                         Margin="2,0,2,0"
                         AllowDrop="True"
+                        ContextFlyout="{StaticResource TabFlyout}"
                         DragEnter="TabViewItem_DragEnter"
                         DragLeave="TabViewItem_DragLeave"
                         Drop="TabViewItem_Drop"

From 579cb3ffff9db6364498e034fbc84a987985d7e5 Mon Sep 17 00:00:00 2001
From: Yair Aichenbaum <39923744+yaichenbaum@users.noreply.github.com>
Date: Tue, 17 Nov 2020 11:08:22 -0500
Subject: [PATCH 2/3] Added the option to duplicate a tab Added the option to
 move a tab to new a window

---
 Files/MultilingualResources/Files.de-DE.xlf   | 12 ++++++
 Files/MultilingualResources/Files.es-ES.xlf   | 12 ++++++
 Files/MultilingualResources/Files.fr-FR.xlf   | 12 ++++++
 Files/MultilingualResources/Files.he-IL.xlf   | 12 ++++++
 Files/MultilingualResources/Files.hi-IN.xlf   | 12 ++++++
 Files/MultilingualResources/Files.hu-HU.xlf   | 12 ++++++
 Files/MultilingualResources/Files.it-IT.xlf   | 12 ++++++
 Files/MultilingualResources/Files.ja-JP.xlf   | 12 ++++++
 Files/MultilingualResources/Files.nl-NL.xlf   | 12 ++++++
 Files/MultilingualResources/Files.or-IN.xlf   | 12 ++++++
 Files/MultilingualResources/Files.pl-PL.xlf   | 12 ++++++
 Files/MultilingualResources/Files.pt-BR.xlf   | 12 ++++++
 Files/MultilingualResources/Files.ru-RU.xlf   | 12 ++++++
 Files/MultilingualResources/Files.ta.xlf      | 12 ++++++
 Files/MultilingualResources/Files.tr-TR.xlf   | 12 ++++++
 Files/MultilingualResources/Files.uk-UA.xlf   | 12 ++++++
 Files/MultilingualResources/Files.zh-Hans.xlf | 12 ++++++
 Files/MultilingualResources/Files.zh-Hant.xlf | 12 ++++++
 Files/Strings/en-US/Resources.resw            |  9 ++++
 .../HorizontalMultitaskingControl.xaml        | 23 ++++++++--
 .../HorizontalMultitaskingControl.xaml.cs     | 12 ++++++
 Files/Views/MainPage.xaml.cs                  | 42 +++++++++++++++++++
 22 files changed, 299 insertions(+), 3 deletions(-)

diff --git a/Files/MultilingualResources/Files.de-DE.xlf b/Files/MultilingualResources/Files.de-DE.xlf
index 90b939c366d6..fcf87d7d9da3 100644
--- a/Files/MultilingualResources/Files.de-DE.xlf
+++ b/Files/MultilingualResources/Files.de-DE.xlf
@@ -1461,6 +1461,18 @@
           <source>Eject</source>
           <target state="new">Eject</target>
         </trans-unit>
+        <trans-unit id="HorizontalMultitaskingControlDuplicateTab.Text" translate="yes" xml:space="preserve">
+          <source>Duplicate tab</source>
+          <target state="new">Duplicate tab</target>
+        </trans-unit>
+        <trans-unit id="HorizontalMultitaskingControlMoveTabToNewWindow.Text" translate="yes" xml:space="preserve">
+          <source>Move tab to new window</source>
+          <target state="new">Move tab to new window</target>
+        </trans-unit>
+        <trans-unit id="HorizontalMultitaskingControlNewTab.Text" translate="yes" xml:space="preserve">
+          <source>New tab</source>
+          <target state="new">New tab</target>
+        </trans-unit>
       </group>
     </body>
   </file>
diff --git a/Files/MultilingualResources/Files.es-ES.xlf b/Files/MultilingualResources/Files.es-ES.xlf
index 6d5e420660d3..8c1067d7a947 100644
--- a/Files/MultilingualResources/Files.es-ES.xlf
+++ b/Files/MultilingualResources/Files.es-ES.xlf
@@ -1458,6 +1458,18 @@
           <source>Eject</source>
           <target state="translated">Expulsar</target>
         </trans-unit>
+        <trans-unit id="HorizontalMultitaskingControlDuplicateTab.Text" translate="yes" xml:space="preserve">
+          <source>Duplicate tab</source>
+          <target state="new">Duplicate tab</target>
+        </trans-unit>
+        <trans-unit id="HorizontalMultitaskingControlMoveTabToNewWindow.Text" translate="yes" xml:space="preserve">
+          <source>Move tab to new window</source>
+          <target state="new">Move tab to new window</target>
+        </trans-unit>
+        <trans-unit id="HorizontalMultitaskingControlNewTab.Text" translate="yes" xml:space="preserve">
+          <source>New tab</source>
+          <target state="new">New tab</target>
+        </trans-unit>
       </group>
     </body>
   </file>
diff --git a/Files/MultilingualResources/Files.fr-FR.xlf b/Files/MultilingualResources/Files.fr-FR.xlf
index 97c45fa3af30..77a2419cf606 100644
--- a/Files/MultilingualResources/Files.fr-FR.xlf
+++ b/Files/MultilingualResources/Files.fr-FR.xlf
@@ -1459,6 +1459,18 @@
           <source>Eject</source>
           <target state="new">Eject</target>
         </trans-unit>
+        <trans-unit id="HorizontalMultitaskingControlDuplicateTab.Text" translate="yes" xml:space="preserve">
+          <source>Duplicate tab</source>
+          <target state="new">Duplicate tab</target>
+        </trans-unit>
+        <trans-unit id="HorizontalMultitaskingControlMoveTabToNewWindow.Text" translate="yes" xml:space="preserve">
+          <source>Move tab to new window</source>
+          <target state="new">Move tab to new window</target>
+        </trans-unit>
+        <trans-unit id="HorizontalMultitaskingControlNewTab.Text" translate="yes" xml:space="preserve">
+          <source>New tab</source>
+          <target state="new">New tab</target>
+        </trans-unit>
       </group>
     </body>
   </file>
diff --git a/Files/MultilingualResources/Files.he-IL.xlf b/Files/MultilingualResources/Files.he-IL.xlf
index d84877577d35..3fcc3f9d1418 100644
--- a/Files/MultilingualResources/Files.he-IL.xlf
+++ b/Files/MultilingualResources/Files.he-IL.xlf
@@ -1458,6 +1458,18 @@
           <source>Eject</source>
           <target state="new">Eject</target>
         </trans-unit>
+        <trans-unit id="HorizontalMultitaskingControlDuplicateTab.Text" translate="yes" xml:space="preserve">
+          <source>Duplicate tab</source>
+          <target state="new">Duplicate tab</target>
+        </trans-unit>
+        <trans-unit id="HorizontalMultitaskingControlMoveTabToNewWindow.Text" translate="yes" xml:space="preserve">
+          <source>Move tab to new window</source>
+          <target state="new">Move tab to new window</target>
+        </trans-unit>
+        <trans-unit id="HorizontalMultitaskingControlNewTab.Text" translate="yes" xml:space="preserve">
+          <source>New tab</source>
+          <target state="new">New tab</target>
+        </trans-unit>
       </group>
     </body>
   </file>
diff --git a/Files/MultilingualResources/Files.hi-IN.xlf b/Files/MultilingualResources/Files.hi-IN.xlf
index f359199e6bce..a5b4b1498ff3 100644
--- a/Files/MultilingualResources/Files.hi-IN.xlf
+++ b/Files/MultilingualResources/Files.hi-IN.xlf
@@ -1470,6 +1470,18 @@
           <source>Eject</source>
           <target state="new">Eject</target>
         </trans-unit>
+        <trans-unit id="HorizontalMultitaskingControlDuplicateTab.Text" translate="yes" xml:space="preserve">
+          <source>Duplicate tab</source>
+          <target state="new">Duplicate tab</target>
+        </trans-unit>
+        <trans-unit id="HorizontalMultitaskingControlMoveTabToNewWindow.Text" translate="yes" xml:space="preserve">
+          <source>Move tab to new window</source>
+          <target state="new">Move tab to new window</target>
+        </trans-unit>
+        <trans-unit id="HorizontalMultitaskingControlNewTab.Text" translate="yes" xml:space="preserve">
+          <source>New tab</source>
+          <target state="new">New tab</target>
+        </trans-unit>
       </group>
     </body>
   </file>
diff --git a/Files/MultilingualResources/Files.hu-HU.xlf b/Files/MultilingualResources/Files.hu-HU.xlf
index 7b608816a738..bd6ca07560d5 100644
--- a/Files/MultilingualResources/Files.hu-HU.xlf
+++ b/Files/MultilingualResources/Files.hu-HU.xlf
@@ -1458,6 +1458,18 @@
           <source>Eject</source>
           <target state="new">Eject</target>
         </trans-unit>
+        <trans-unit id="HorizontalMultitaskingControlDuplicateTab.Text" translate="yes" xml:space="preserve">
+          <source>Duplicate tab</source>
+          <target state="new">Duplicate tab</target>
+        </trans-unit>
+        <trans-unit id="HorizontalMultitaskingControlMoveTabToNewWindow.Text" translate="yes" xml:space="preserve">
+          <source>Move tab to new window</source>
+          <target state="new">Move tab to new window</target>
+        </trans-unit>
+        <trans-unit id="HorizontalMultitaskingControlNewTab.Text" translate="yes" xml:space="preserve">
+          <source>New tab</source>
+          <target state="new">New tab</target>
+        </trans-unit>
       </group>
     </body>
   </file>
diff --git a/Files/MultilingualResources/Files.it-IT.xlf b/Files/MultilingualResources/Files.it-IT.xlf
index 3075aa0c2c86..8fff02ffa9fc 100644
--- a/Files/MultilingualResources/Files.it-IT.xlf
+++ b/Files/MultilingualResources/Files.it-IT.xlf
@@ -1459,6 +1459,18 @@
           <source>Eject</source>
           <target state="new">Eject</target>
         </trans-unit>
+        <trans-unit id="HorizontalMultitaskingControlDuplicateTab.Text" translate="yes" xml:space="preserve">
+          <source>Duplicate tab</source>
+          <target state="new">Duplicate tab</target>
+        </trans-unit>
+        <trans-unit id="HorizontalMultitaskingControlMoveTabToNewWindow.Text" translate="yes" xml:space="preserve">
+          <source>Move tab to new window</source>
+          <target state="new">Move tab to new window</target>
+        </trans-unit>
+        <trans-unit id="HorizontalMultitaskingControlNewTab.Text" translate="yes" xml:space="preserve">
+          <source>New tab</source>
+          <target state="new">New tab</target>
+        </trans-unit>
       </group>
     </body>
   </file>
diff --git a/Files/MultilingualResources/Files.ja-JP.xlf b/Files/MultilingualResources/Files.ja-JP.xlf
index a7b156cea0da..fd8335a8a97a 100644
--- a/Files/MultilingualResources/Files.ja-JP.xlf
+++ b/Files/MultilingualResources/Files.ja-JP.xlf
@@ -1458,6 +1458,18 @@
           <source>Eject</source>
           <target state="new">Eject</target>
         </trans-unit>
+        <trans-unit id="HorizontalMultitaskingControlDuplicateTab.Text" translate="yes" xml:space="preserve">
+          <source>Duplicate tab</source>
+          <target state="new">Duplicate tab</target>
+        </trans-unit>
+        <trans-unit id="HorizontalMultitaskingControlMoveTabToNewWindow.Text" translate="yes" xml:space="preserve">
+          <source>Move tab to new window</source>
+          <target state="new">Move tab to new window</target>
+        </trans-unit>
+        <trans-unit id="HorizontalMultitaskingControlNewTab.Text" translate="yes" xml:space="preserve">
+          <source>New tab</source>
+          <target state="new">New tab</target>
+        </trans-unit>
       </group>
     </body>
   </file>
diff --git a/Files/MultilingualResources/Files.nl-NL.xlf b/Files/MultilingualResources/Files.nl-NL.xlf
index f9caba50d069..d3aecf9a4963 100644
--- a/Files/MultilingualResources/Files.nl-NL.xlf
+++ b/Files/MultilingualResources/Files.nl-NL.xlf
@@ -1472,6 +1472,18 @@
           <source>Eject</source>
           <target state="new">Eject</target>
         </trans-unit>
+        <trans-unit id="HorizontalMultitaskingControlDuplicateTab.Text" translate="yes" xml:space="preserve">
+          <source>Duplicate tab</source>
+          <target state="new">Duplicate tab</target>
+        </trans-unit>
+        <trans-unit id="HorizontalMultitaskingControlMoveTabToNewWindow.Text" translate="yes" xml:space="preserve">
+          <source>Move tab to new window</source>
+          <target state="new">Move tab to new window</target>
+        </trans-unit>
+        <trans-unit id="HorizontalMultitaskingControlNewTab.Text" translate="yes" xml:space="preserve">
+          <source>New tab</source>
+          <target state="new">New tab</target>
+        </trans-unit>
       </group>
     </body>
   </file>
diff --git a/Files/MultilingualResources/Files.or-IN.xlf b/Files/MultilingualResources/Files.or-IN.xlf
index 8124ff4740f2..71c9ddc38cf8 100644
--- a/Files/MultilingualResources/Files.or-IN.xlf
+++ b/Files/MultilingualResources/Files.or-IN.xlf
@@ -1470,6 +1470,18 @@
           <source>Eject</source>
           <target state="new">Eject</target>
         </trans-unit>
+        <trans-unit id="HorizontalMultitaskingControlDuplicateTab.Text" translate="yes" xml:space="preserve">
+          <source>Duplicate tab</source>
+          <target state="new">Duplicate tab</target>
+        </trans-unit>
+        <trans-unit id="HorizontalMultitaskingControlMoveTabToNewWindow.Text" translate="yes" xml:space="preserve">
+          <source>Move tab to new window</source>
+          <target state="new">Move tab to new window</target>
+        </trans-unit>
+        <trans-unit id="HorizontalMultitaskingControlNewTab.Text" translate="yes" xml:space="preserve">
+          <source>New tab</source>
+          <target state="new">New tab</target>
+        </trans-unit>
       </group>
     </body>
   </file>
diff --git a/Files/MultilingualResources/Files.pl-PL.xlf b/Files/MultilingualResources/Files.pl-PL.xlf
index 8232cc2cbc33..56cb7de237be 100644
--- a/Files/MultilingualResources/Files.pl-PL.xlf
+++ b/Files/MultilingualResources/Files.pl-PL.xlf
@@ -1471,6 +1471,18 @@
           <source>Eject</source>
           <target state="new">Eject</target>
         </trans-unit>
+        <trans-unit id="HorizontalMultitaskingControlDuplicateTab.Text" translate="yes" xml:space="preserve">
+          <source>Duplicate tab</source>
+          <target state="new">Duplicate tab</target>
+        </trans-unit>
+        <trans-unit id="HorizontalMultitaskingControlMoveTabToNewWindow.Text" translate="yes" xml:space="preserve">
+          <source>Move tab to new window</source>
+          <target state="new">Move tab to new window</target>
+        </trans-unit>
+        <trans-unit id="HorizontalMultitaskingControlNewTab.Text" translate="yes" xml:space="preserve">
+          <source>New tab</source>
+          <target state="new">New tab</target>
+        </trans-unit>
       </group>
     </body>
   </file>
diff --git a/Files/MultilingualResources/Files.pt-BR.xlf b/Files/MultilingualResources/Files.pt-BR.xlf
index d31057605a83..825033511783 100644
--- a/Files/MultilingualResources/Files.pt-BR.xlf
+++ b/Files/MultilingualResources/Files.pt-BR.xlf
@@ -1458,6 +1458,18 @@
           <source>Eject</source>
           <target state="new">Eject</target>
         </trans-unit>
+        <trans-unit id="HorizontalMultitaskingControlDuplicateTab.Text" translate="yes" xml:space="preserve">
+          <source>Duplicate tab</source>
+          <target state="new">Duplicate tab</target>
+        </trans-unit>
+        <trans-unit id="HorizontalMultitaskingControlMoveTabToNewWindow.Text" translate="yes" xml:space="preserve">
+          <source>Move tab to new window</source>
+          <target state="new">Move tab to new window</target>
+        </trans-unit>
+        <trans-unit id="HorizontalMultitaskingControlNewTab.Text" translate="yes" xml:space="preserve">
+          <source>New tab</source>
+          <target state="new">New tab</target>
+        </trans-unit>
       </group>
     </body>
   </file>
diff --git a/Files/MultilingualResources/Files.ru-RU.xlf b/Files/MultilingualResources/Files.ru-RU.xlf
index 267f989a895c..cccbee908241 100644
--- a/Files/MultilingualResources/Files.ru-RU.xlf
+++ b/Files/MultilingualResources/Files.ru-RU.xlf
@@ -1458,6 +1458,18 @@
           <source>Eject</source>
           <target state="translated">Извлечь</target>
         </trans-unit>
+        <trans-unit id="HorizontalMultitaskingControlDuplicateTab.Text" translate="yes" xml:space="preserve">
+          <source>Duplicate tab</source>
+          <target state="new">Duplicate tab</target>
+        </trans-unit>
+        <trans-unit id="HorizontalMultitaskingControlMoveTabToNewWindow.Text" translate="yes" xml:space="preserve">
+          <source>Move tab to new window</source>
+          <target state="new">Move tab to new window</target>
+        </trans-unit>
+        <trans-unit id="HorizontalMultitaskingControlNewTab.Text" translate="yes" xml:space="preserve">
+          <source>New tab</source>
+          <target state="new">New tab</target>
+        </trans-unit>
       </group>
     </body>
   </file>
diff --git a/Files/MultilingualResources/Files.ta.xlf b/Files/MultilingualResources/Files.ta.xlf
index 34c1ecdd8c7e..81dd0344c08c 100644
--- a/Files/MultilingualResources/Files.ta.xlf
+++ b/Files/MultilingualResources/Files.ta.xlf
@@ -1463,6 +1463,18 @@
           <source>Eject</source>
           <target state="new">Eject</target>
         </trans-unit>
+        <trans-unit id="HorizontalMultitaskingControlDuplicateTab.Text" translate="yes" xml:space="preserve">
+          <source>Duplicate tab</source>
+          <target state="new">Duplicate tab</target>
+        </trans-unit>
+        <trans-unit id="HorizontalMultitaskingControlMoveTabToNewWindow.Text" translate="yes" xml:space="preserve">
+          <source>Move tab to new window</source>
+          <target state="new">Move tab to new window</target>
+        </trans-unit>
+        <trans-unit id="HorizontalMultitaskingControlNewTab.Text" translate="yes" xml:space="preserve">
+          <source>New tab</source>
+          <target state="new">New tab</target>
+        </trans-unit>
       </group>
     </body>
   </file>
diff --git a/Files/MultilingualResources/Files.tr-TR.xlf b/Files/MultilingualResources/Files.tr-TR.xlf
index d8feeb4d6629..12b9929ec99d 100644
--- a/Files/MultilingualResources/Files.tr-TR.xlf
+++ b/Files/MultilingualResources/Files.tr-TR.xlf
@@ -1467,6 +1467,18 @@
           <source>Eject</source>
           <target state="new">Eject</target>
         </trans-unit>
+        <trans-unit id="HorizontalMultitaskingControlDuplicateTab.Text" translate="yes" xml:space="preserve">
+          <source>Duplicate tab</source>
+          <target state="new">Duplicate tab</target>
+        </trans-unit>
+        <trans-unit id="HorizontalMultitaskingControlMoveTabToNewWindow.Text" translate="yes" xml:space="preserve">
+          <source>Move tab to new window</source>
+          <target state="new">Move tab to new window</target>
+        </trans-unit>
+        <trans-unit id="HorizontalMultitaskingControlNewTab.Text" translate="yes" xml:space="preserve">
+          <source>New tab</source>
+          <target state="new">New tab</target>
+        </trans-unit>
       </group>
     </body>
   </file>
diff --git a/Files/MultilingualResources/Files.uk-UA.xlf b/Files/MultilingualResources/Files.uk-UA.xlf
index 2757ef3e2ad1..343c0d693d19 100644
--- a/Files/MultilingualResources/Files.uk-UA.xlf
+++ b/Files/MultilingualResources/Files.uk-UA.xlf
@@ -1458,6 +1458,18 @@
           <source>Eject</source>
           <target state="translated">Вилучити</target>
         </trans-unit>
+        <trans-unit id="HorizontalMultitaskingControlDuplicateTab.Text" translate="yes" xml:space="preserve">
+          <source>Duplicate tab</source>
+          <target state="new">Duplicate tab</target>
+        </trans-unit>
+        <trans-unit id="HorizontalMultitaskingControlMoveTabToNewWindow.Text" translate="yes" xml:space="preserve">
+          <source>Move tab to new window</source>
+          <target state="new">Move tab to new window</target>
+        </trans-unit>
+        <trans-unit id="HorizontalMultitaskingControlNewTab.Text" translate="yes" xml:space="preserve">
+          <source>New tab</source>
+          <target state="new">New tab</target>
+        </trans-unit>
       </group>
     </body>
   </file>
diff --git a/Files/MultilingualResources/Files.zh-Hans.xlf b/Files/MultilingualResources/Files.zh-Hans.xlf
index 3d9fc2c6b0fd..1fbccce8cde2 100644
--- a/Files/MultilingualResources/Files.zh-Hans.xlf
+++ b/Files/MultilingualResources/Files.zh-Hans.xlf
@@ -1463,6 +1463,18 @@
           <source>Eject</source>
           <target state="new">Eject</target>
         </trans-unit>
+        <trans-unit id="HorizontalMultitaskingControlDuplicateTab.Text" translate="yes" xml:space="preserve">
+          <source>Duplicate tab</source>
+          <target state="new">Duplicate tab</target>
+        </trans-unit>
+        <trans-unit id="HorizontalMultitaskingControlMoveTabToNewWindow.Text" translate="yes" xml:space="preserve">
+          <source>Move tab to new window</source>
+          <target state="new">Move tab to new window</target>
+        </trans-unit>
+        <trans-unit id="HorizontalMultitaskingControlNewTab.Text" translate="yes" xml:space="preserve">
+          <source>New tab</source>
+          <target state="new">New tab</target>
+        </trans-unit>
       </group>
     </body>
   </file>
diff --git a/Files/MultilingualResources/Files.zh-Hant.xlf b/Files/MultilingualResources/Files.zh-Hant.xlf
index 521a4be6148c..616e4c9cf22f 100644
--- a/Files/MultilingualResources/Files.zh-Hant.xlf
+++ b/Files/MultilingualResources/Files.zh-Hant.xlf
@@ -1469,6 +1469,18 @@
           <source>Eject</source>
           <target state="new">Eject</target>
         </trans-unit>
+        <trans-unit id="HorizontalMultitaskingControlDuplicateTab.Text" translate="yes" xml:space="preserve">
+          <source>Duplicate tab</source>
+          <target state="new">Duplicate tab</target>
+        </trans-unit>
+        <trans-unit id="HorizontalMultitaskingControlMoveTabToNewWindow.Text" translate="yes" xml:space="preserve">
+          <source>Move tab to new window</source>
+          <target state="new">Move tab to new window</target>
+        </trans-unit>
+        <trans-unit id="HorizontalMultitaskingControlNewTab.Text" translate="yes" xml:space="preserve">
+          <source>New tab</source>
+          <target state="new">New tab</target>
+        </trans-unit>
       </group>
     </body>
   </file>
diff --git a/Files/Strings/en-US/Resources.resw b/Files/Strings/en-US/Resources.resw
index 0e1762efa287..8b6780394975 100644
--- a/Files/Strings/en-US/Resources.resw
+++ b/Files/Strings/en-US/Resources.resw
@@ -1206,4 +1206,13 @@
   <data name="SideBarEjectDevice.Text" xml:space="preserve">
     <value>Eject</value>
   </data>
+  <data name="HorizontalMultitaskingControlDuplicateTab.Text" xml:space="preserve">
+    <value>Duplicate tab</value>
+  </data>
+  <data name="HorizontalMultitaskingControlMoveTabToNewWindow.Text" xml:space="preserve">
+    <value>Move tab to new window</value>
+  </data>
+  <data name="HorizontalMultitaskingControlNewTab.Text" xml:space="preserve">
+    <value>New tab</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Files/UserControls/MultitaskingControl/HorizontalMultitaskingControl.xaml b/Files/UserControls/MultitaskingControl/HorizontalMultitaskingControl.xaml
index 827e3f34bbc2..3cb489ad73c0 100644
--- a/Files/UserControls/MultitaskingControl/HorizontalMultitaskingControl.xaml
+++ b/Files/UserControls/MultitaskingControl/HorizontalMultitaskingControl.xaml
@@ -18,15 +18,32 @@
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
                 <ResourceDictionary>
-                    <MenuFlyout x:Key="TabFlyout">
+                    <MenuFlyout x:Key="TabFlyout" x:Name="TabItemContextMenu" Opening="TabItemContextMenu_Opening">
                         <MenuFlyoutItem
-                            x:Uid="NavigationToolbarNewTab"
-                            Click="{x:Bind views:MainPage.AddNewTab}"
+                            x:Uid="HorizontalMultitaskingControlNewTab"
+                            Click="{x:Bind views:MainPage.AddNewTabAtIndex}"
                             Text="New tab">
                             <MenuFlyoutItem.Icon>
                                 <FontIcon FontFamily="{StaticResource CustomGlyph}" Glyph="&#xF104;" />
                             </MenuFlyoutItem.Icon>
                         </MenuFlyoutItem>
+                        <MenuFlyoutItem
+                            x:Uid="HorizontalMultitaskingControlDuplicateTab"
+                            Click="{x:Bind views:MainPage.DuplicateTabAtIndex}"
+                            Text="Duplicate tab">
+                            <MenuFlyoutItem.Icon>
+                                <FontIcon FontFamily="{StaticResource FluentUIGlyphs}" Glyph="&#xE97D;" />
+                            </MenuFlyoutItem.Icon>
+                        </MenuFlyoutItem>
+                        <MenuFlyoutItem
+                            x:Name="MenuItemMoveTabToNewWindow"
+                            x:Uid="HorizontalMultitaskingControlMoveTabToNewWindow"
+                            Click="{x:Bind views:MainPage.MoveTabToNewWindow}"
+                            Text="Move tab to new window">
+                            <MenuFlyoutItem.Icon>
+                                <FontIcon FontFamily="{StaticResource FluentUIGlyphs}" Glyph="&#xE979;" />
+                            </MenuFlyoutItem.Icon>
+                        </MenuFlyoutItem>
                     </MenuFlyout>
                 </ResourceDictionary>
                 <ResourceDictionary Source="/ResourceDictionaries/TabView_themeresources.xaml" />
diff --git a/Files/UserControls/MultitaskingControl/HorizontalMultitaskingControl.xaml.cs b/Files/UserControls/MultitaskingControl/HorizontalMultitaskingControl.xaml.cs
index a272a03402fb..93cdbfbf79e7 100644
--- a/Files/UserControls/MultitaskingControl/HorizontalMultitaskingControl.xaml.cs
+++ b/Files/UserControls/MultitaskingControl/HorizontalMultitaskingControl.xaml.cs
@@ -191,5 +191,17 @@ private async void TabStrip_TabDroppedOutside(TabView sender, TabViewTabDroppedO
                 sender.SelectedIndex = selectedTabViewItemIndex;
             }
         }
+
+        private void TabItemContextMenu_Opening(object sender, object e)
+        {
+            if (MainPage.MultitaskingControl.Items.Count == 1)
+            {
+                MenuItemMoveTabToNewWindow.IsEnabled = false;
+            }
+            else
+            {
+                MenuItemMoveTabToNewWindow.IsEnabled = true;
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/Files/Views/MainPage.xaml.cs b/Files/Views/MainPage.xaml.cs
index f8c78cd01921..bac3ad56614b 100644
--- a/Files/Views/MainPage.xaml.cs
+++ b/Files/Views/MainPage.xaml.cs
@@ -173,6 +173,48 @@ public static async void AddNewTab()
             await AddNewTabByPathAsync(typeof(ModernShellPage), "NewTab".GetLocalized());
         }
 
+        public static async void AddNewTabAtIndex(object sender, RoutedEventArgs e)
+        {
+            var tabItem = ((FrameworkElement)sender).DataContext as TabItem;
+            var index = MainPage.AppInstances.IndexOf(tabItem);
+            await MainPage.AddNewTabByPathAsync(typeof(ModernShellPage), "NewTab".GetLocalized(), index + 1);
+        }
+        
+        public static async void DuplicateTabAtIndex(object sender, RoutedEventArgs e)
+        {
+            var tabItem = ((FrameworkElement)sender).DataContext as TabItem;
+            var index = MainPage.AppInstances.IndexOf(tabItem);
+
+            if (MainPage.AppInstances[index].Path != null)
+            {
+                await MainPage.AddNewTabByPathAsync(typeof(ModernShellPage), MainPage.AppInstances[index].Path, index + 1);
+            }
+            else
+            {
+                await MainPage.AddNewTabByPathAsync(typeof(ModernShellPage), "NewTab".GetLocalized(), index + 1);
+            }
+        }
+        
+        public static async void MoveTabToNewWindow(object sender, RoutedEventArgs e)
+        {
+            var tabItem = ((FrameworkElement)sender).DataContext as TabItem;
+            var index = MainPage.AppInstances.IndexOf(tabItem);
+            var path = MainPage.AppInstances[index].Path;
+
+            MainPage.MultitaskingControl.Items.RemoveAt(index);
+
+            if (path != null)
+            {
+                var folderUri = new Uri("files-uwp:" + "?folder=" + path);
+                await Launcher.LaunchUriAsync(folderUri);
+            }
+            else
+            {
+                var folderUri = new Uri("files-uwp:" + "?folder=" + "NewTab".GetLocalized());
+                await Launcher.LaunchUriAsync(folderUri);
+            }
+        }
+
         public static async Task AddNewTabByPathAsync(Type type, string path, int atIndex = -1)
         {
             string tabLocationHeader = null;

From 99cfffc3df31c37af69234039da557d336e46716 Mon Sep 17 00:00:00 2001
From: Yair Aichenbaum <39923744+yaichenbaum@users.noreply.github.com>
Date: Tue, 17 Nov 2020 14:40:24 -0500
Subject: [PATCH 3/3] Fixed issue with navigation

---
 Files/Views/MainPage.xaml.cs | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/Files/Views/MainPage.xaml.cs b/Files/Views/MainPage.xaml.cs
index bac3ad56614b..507571ef222d 100644
--- a/Files/Views/MainPage.xaml.cs
+++ b/Files/Views/MainPage.xaml.cs
@@ -175,11 +175,9 @@ public static async void AddNewTab()
 
         public static async void AddNewTabAtIndex(object sender, RoutedEventArgs e)
         {
-            var tabItem = ((FrameworkElement)sender).DataContext as TabItem;
-            var index = MainPage.AppInstances.IndexOf(tabItem);
-            await MainPage.AddNewTabByPathAsync(typeof(ModernShellPage), "NewTab".GetLocalized(), index + 1);
+            await MainPage.AddNewTabByPathAsync(typeof(ModernShellPage), "NewTab".GetLocalized());
         }
-        
+
         public static async void DuplicateTabAtIndex(object sender, RoutedEventArgs e)
         {
             var tabItem = ((FrameworkElement)sender).DataContext as TabItem;
@@ -187,14 +185,14 @@ public static async void DuplicateTabAtIndex(object sender, RoutedEventArgs e)
 
             if (MainPage.AppInstances[index].Path != null)
             {
-                await MainPage.AddNewTabByPathAsync(typeof(ModernShellPage), MainPage.AppInstances[index].Path, index + 1);
+                await MainPage.AddNewTabByPathAsync(typeof(ModernShellPage), MainPage.AppInstances[index].Path);
             }
             else
             {
-                await MainPage.AddNewTabByPathAsync(typeof(ModernShellPage), "NewTab".GetLocalized(), index + 1);
+                await MainPage.AddNewTabByPathAsync(typeof(ModernShellPage), "NewTab".GetLocalized());
             }
         }
-        
+
         public static async void MoveTabToNewWindow(object sender, RoutedEventArgs e)
         {
             var tabItem = ((FrameworkElement)sender).DataContext as TabItem;