Skip to content

Feature: Optimized drag area #10787

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 21, 2022
Merged

Feature: Optimized drag area #10787

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
07af765
Feature: Optimized drag area
yaira2 Dec 21, 2022
42eaeba
Update MainPage.xaml
yaira2 Dec 21, 2022
c91c6e3
Update MainPage.xaml
yaira2 Dec 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 0 additions & 19 deletions src/Files.App/Converters/WidthToRightMargin.cs
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions src/Files.App/UserControls/MultitaskingControl/HorizontalMultitaskingControl.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
3 changes: 2 additions & 1 deletion src/Files.App/UserControls/MultitaskingControl/HorizontalMultitaskingControl.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
}
13 changes: 0 additions & 13 deletions src/Files.App/UserControls/StringEncodedImage.xaml
View file
Open in desktop

This file was deleted.

54 changes: 0 additions & 54 deletions src/Files.App/UserControls/StringEncodedImage.xaml.cs
View file
Open in desktop

This file was deleted.

47 changes: 10 additions & 37 deletions src/Files.App/Views/MainPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down