Merge branch 'files-community:main' into props

Author: Lamparter

src/Files.App/7z.dll

@@ -260,7 +260,8 @@
 						Grid.ColumnSpan="2"
 						HorizontalAlignment="Stretch"
 						VerticalAlignment="Stretch"
-						Fill="Transparent" />
+						Fill="Transparent"
+						Loaded="DragAreaRectangle_Loaded" />
 
 				</Grid>
 			</TabView.TabStripFooter>

src/Files.App/7z64.dll

@@ -64,15 +64,6 @@ public TabBar()
 			tabHoverTimer.Interval = TimeSpan.FromMilliseconds(Constants.DragAndDrop.HoverToOpenTimespan);
 			tabHoverTimer.Tick += TabHoverSelected;
 
-			var appWindow = MainWindow.Instance.AppWindow;
-
-			double rightPaddingColumnWidth =
-				FilePropertiesHelpers.FlowDirectionSettingIsRightToLeft
-					? appWindow.TitleBar.LeftInset
-					: appWindow.TitleBar.RightInset;
-
-			RightPaddingColumn.Width = new(rightPaddingColumnWidth >= 0 ? rightPaddingColumnWidth : 0);
-
 			AppearanceSettingsService.PropertyChanged += (s, e) =>
 			{
 				switch (e.PropertyName)
@@ -366,5 +357,16 @@ private void TabViewItem_Loaded(object sender, RoutedEventArgs e)
 				});
 			}
 		}
+
+		private void DragAreaRectangle_Loaded(object sender, RoutedEventArgs e)
+		{
+			double scaleAdjustment = DragAreaRectangle.XamlRoot.RasterizationScale;
+			double titleBarInset = ((FilePropertiesHelpers.FlowDirectionSettingIsRightToLeft
+				? MainWindow.Instance.AppWindow.TitleBar.LeftInset
+				: MainWindow.Instance.AppWindow.TitleBar.RightInset) / scaleAdjustment) + 40;
+
+			HorizontalTabView.Measure(new(HorizontalTabView.ActualWidth - TabBarAddNewTabButton.Width - titleBarInset, HorizontalTabView.ActualHeight));
+			RightPaddingColumn.Width = new(titleBarInset >= 0 ? titleBarInset : 0);
+		}
 	}
-}
+}

src/Files.App/7zArm64.dll

@@ -82,7 +82,6 @@ private static Task<IEnumerable<ICloudProvider>> DetectGenericCloudDrive()
 					CloudProviders? cloudProvider = driveType switch
 					{
 						"MEGA" => CloudProviders.Mega,
-						"Amazon Drive" => CloudProviders.AmazonDrive,
 						"Nextcloud" => CloudProviders.Nextcloud,
 						"Jottacloud" => CloudProviders.Jottacloud,
 						"iCloudDrive" => CloudProviders.AppleCloudDrive,
@@ -109,7 +108,6 @@ private static Task<IEnumerable<ICloudProvider>> DetectGenericCloudDrive()
 						Name = cloudProvider switch
 						{
 							CloudProviders.Mega => $"MEGA ({Path.GetFileName(syncedFolder.TrimEnd('\\'))})",
-							CloudProviders.AmazonDrive => $"Amazon Drive",
 							CloudProviders.Nextcloud => !string.IsNullOrEmpty(nextCloudValue) ? nextCloudValue : "Nextcloud",
 							CloudProviders.Jottacloud => $"Jottacloud",
 							CloudProviders.AppleCloudDrive => $"iCloud Drive",

src/Files.App/UserControls/TabBar/TabBar.xaml

@@ -19,8 +19,6 @@ public enum CloudProviders
 
 		AppleCloudPhotos,
 
-		AmazonDrive,
-
 		Nextcloud,
 
 		Yandex,

src/Files.App/UserControls/TabBar/TabBar.xaml.cs

@@ -487,4 +487,4 @@ private void PaneSplitter_ManipulationStarted(object sender, ManipulationStarted
 				InputSystemCursorShape.SizeWestEast : InputSystemCursorShape.SizeNorthSouth));
 		}
 	}
-}
+}