Feature: Optimized drag area (#10787)

Author: yaira2

src/Files.App/Converters/WidthToRightMargin.cs

@@ -605,13 +605,13 @@
 					<ContentPresenter Grid.Column="0" Content="{x:Bind ActionsControl, Mode=OneWay}" />
 
 					<!--  This defines the drag area for the title bar  -->
-					<Grid
-						x:Name="DragAreaGrid"
+					<Rectangle
+						x:Name="DragAreaRectangle"
 						Grid.Column="1"
 						Grid.ColumnSpan="2"
 						HorizontalAlignment="Stretch"
 						VerticalAlignment="Stretch"
-						Background="Transparent" />
+						Fill="Transparent" />
 				</Grid>
 			</TabView.TabStripFooter>
 		</TabView>

src/Files.App/UserControls/MultitaskingControl/HorizontalMultitaskingControl.xaml

@@ -3,6 +3,7 @@
 using Files.App.ViewModels;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Shapes;
 using System;
 using System.Linq;
 using Windows.ApplicationModel.DataTransfer;
@@ -232,6 +233,6 @@ public Visibility TabStripVisibility
 		public static readonly DependencyProperty TabStripVisibilityProperty =
 			DependencyProperty.Register("TabStripVisibility", typeof(Visibility), typeof(HorizontalMultitaskingControl), new PropertyMetadata(Visibility.Visible));
 
-		public Grid DragArea => DragAreaGrid;
+		public Rectangle DragArea => DragAreaRectangle;
 	}
 }

src/Files.App/UserControls/MultitaskingControl/HorizontalMultitaskingControl.xaml.cs

@@ -3,8 +3,7 @@
 	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 	xmlns:controls="using:Files.App.UserControls"
-	xmlns:converters="using:Files.App.Converters"
-	xmlns:converters1="using:CommunityToolkit.WinUI.UI.Converters"
+	xmlns:converters="using:CommunityToolkit.WinUI.UI.Converters"
 	xmlns:custom="using:CommunityToolkit.WinUI.UI.Controls"
 	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
 	xmlns:helpers="using:Files.App.Helpers"
@@ -23,34 +22,23 @@
 	<Page.DataContext>
 		<viewmodels:MainPageViewModel />
 	</Page.DataContext>
+
 	<Page.Resources>
 		<ResourceDictionary>
 			<ResourceDictionary.MergedDictionaries>
 				<ResourceDictionary Source="ms-appx:///ResourceDictionaries/DefaultGridSplitterStyle.xaml" />
 			</ResourceDictionary.MergedDictionaries>
 
-			<ResourceDictionary.ThemeDictionaries>
-				<ResourceDictionary x:Key="Light">
-					<SolidColorBrush x:Key="NavigationViewContentGridBorderBrush" Color="{ThemeResource ControlStrokeColorDefault}" />
-					<Thickness x:Key="NavigationViewContentGridBorderThickness">1,0,0,0</Thickness>
-				</ResourceDictionary>
-				<ResourceDictionary x:Key="Dark">
-					<SolidColorBrush x:Key="NavigationViewContentGridBorderBrush" Color="{ThemeResource ControlStrokeColorDefault}" />
-					<Thickness x:Key="NavigationViewContentGridBorderThickness">1,0,0,0</Thickness>
-				</ResourceDictionary>
-				<ResourceDictionary x:Key="HighContrast">
-					<SolidColorBrush x:Key="NavigationViewContentGridBorderBrush" Color="{ThemeResource ControlStrokeColorDefault}" />
-					<Thickness x:Key="NavigationViewContentGridBorderThickness">1,0,0,0</Thickness>
-				</ResourceDictionary>
-			</ResourceDictionary.ThemeDictionaries>
-
 			<x:Boolean x:Key="True">True</x:Boolean>
 			<x:Boolean x:Key="False">False</x:Boolean>
 
-			<converters:WidthToRightMargin x:Key="WidthToRightMarginConverter" />
-			<converters1:BoolNegationConverter x:Key="BoolNegationConverter" />
+			<converters:BoolNegationConverter x:Key="BoolNegationConverter" />
+
+			<SolidColorBrush x:Key="NavigationViewContentGridBorderBrush" Color="{ThemeResource ControlStrokeColorDefault}" />
+			<Thickness x:Key="NavigationViewContentGridBorderThickness">1,0,0,0</Thickness>
 		</ResourceDictionary>
 	</Page.Resources>
+
 	<Page.KeyboardAccelerators>
 		<KeyboardAccelerator Key="Number1" Modifiers="Control">
 			<i:Interaction.Behaviors>
@@ -362,24 +350,6 @@
 		</controls:SidebarControl>
 
 		<VisualStateManager.VisualStateGroups>
-			<VisualStateGroup x:Name="MultitaskingControlStates">
-				<VisualState x:Name="NormalWindowWidth">
-					<VisualState.StateTriggers>
-						<AdaptiveTrigger x:Name="CollapseHorizontalTabViewTrigger" MinWindowWidth="500" />
-					</VisualState.StateTriggers>
-				</VisualState>
-				<VisualState x:Name="HorizontalTabViewCollapsed">
-					<VisualState.StateTriggers>
-						<AdaptiveTrigger MinWindowWidth="0" />
-					</VisualState.StateTriggers>
-					<VisualState.Setters>
-						<Setter Target="horizontalMultitaskingControl.TabStripVisibility" Value="Collapsed" />
-
-						<!--  Update the button size to match the pane toggle button size  -->
-						<Setter Target="HorizontalMultitaskingControlAddButton.Visibility" Value="Collapsed" />
-					</VisualState.Setters>
-				</VisualState>
-			</VisualStateGroup>
 			<VisualStateGroup>
 				<VisualState>
 					<VisualState.StateTriggers>
@@ -410,6 +380,9 @@
 						<Setter Target="SidebarControl.PaneDisplayMode" Value="LeftMinimal" />
 						<Setter Target="SidebarControl.IsPaneToggleButtonVisible" Value="True" />
 						<Setter Target="horizontalMultitaskingControl.Margin" Value="48,0,0,0" />
+						
+						<!--  Update the button size to match the pane toggle button size  -->
+						<Setter Target="HorizontalMultitaskingControlAddButton.Visibility" Value="Collapsed" />
 					</VisualState.Setters>
 				</VisualState>
 			</VisualStateGroup>