Skip to content

Code Quality: Follow up fixes for the title bar drag region #16595

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.

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
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
d934b93
Fix: Init
XTorLukas Nov 29, 2024
9918dfb
Fix: Prevention of incorrect sizing
XTorLukas Nov 29, 2024
d25fc8e
CQ: Move to TabBar
XTorLukas Nov 30, 2024
a13dc4c
CQ: set drag area in TabBar
XTorLukas Nov 30, 2024
460af78
Fix
XTorLukas Nov 30, 2024
8dee768
CQ: Revert
XTorLukas Nov 30, 2024
6baa2ed
Fix: Fix problem when opening many tabs without changing DragArea size
XTorLukas Nov 30, 2024
c4a84d2
CQ: Displaying the correct gap size using different dpi
XTorLukas Nov 30, 2024
57b8edc
Update: Get dpi from AppModel
XTorLukas Dec 2, 2024
b2e8305
CQ: Change size gap
XTorLukas Dec 2, 2024
ea9dabc
CQ: Fix possible error when loading TitleBar property
XTorLukas Dec 2, 2024
8fed828
CQ: Fix wrong calculating
XTorLukas Dec 3, 2024
ad52076
Revert: `InitializeTitleBarAsync`
XTorLukas Dec 3, 2024
183cd42
CQ: Grouping into the single method
XTorLukas Dec 8, 2024
86a339a
Update src/Files.App/UserControls/TabBar/TabBar.xaml.cs
yaira2 Dec 9, 2024
379782d
Revert changes to mainpage
yaira2 Dec 9, 2024
e6f7f97
Update TabBar.xaml.cs
yaira2 Dec 9, 2024
25285c4
Fix: Resolve problems
XTorLukas Dec 10, 2024
48abf01
Revert changes TabBar.xaml.cs
XTorLukas Dec 10, 2024
04430c8
Merge branch 'main' into xtorlukas/RevertFix-DragBarRegion
XTorLukas Dec 10, 2024
65465d1
CQ: Repeated call only once
XTorLukas Dec 10, 2024
8f38acb
Update
XTorLukas Dec 11, 2024
7da73d4
Update
XTorLukas Dec 12, 2024
4a7e2db
Format
XTorLukas Dec 12, 2024
ff7eb87
Update src/Files.App/UserControls/TabBar/TabBar.xaml.cs
XTorLukas Dec 12, 2024
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
16 changes: 10 additions & 6 deletions src/Files.App/UserControls/TabBar/TabBar.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -358,15 +358,19 @@ private void TabViewItem_Loaded(object sender, RoutedEventArgs e)
}
}

private void DragAreaRectangle_Loaded(object sender, RoutedEventArgs e)
private async void DragAreaRectangle_Loaded(object sender, RoutedEventArgs e)
{
double scaleAdjustment = DragAreaRectangle.XamlRoot.RasterizationScale;
double titleBarInset = ((FilePropertiesHelpers.FlowDirectionSettingIsRightToLeft
if (HorizontalTabView.ActualWidth <= 0 && TabBarAddNewTabButton.Width <= 0)
await Task.Delay(100);

var titleBarInset = ((FilePropertiesHelpers.FlowDirectionSettingIsRightToLeft
? MainWindow.Instance.AppWindow.TitleBar.LeftInset
: MainWindow.Instance.AppWindow.TitleBar.RightInset) / scaleAdjustment) + 40;
: MainWindow.Instance.AppWindow.TitleBar.RightInset) / DragAreaRectangle.XamlRoot.RasterizationScale) + 40;

HorizontalTabView.Measure(new(HorizontalTabView.ActualWidth - TabBarAddNewTabButton.Width - titleBarInset, HorizontalTabView.ActualHeight));
RightPaddingColumn.Width = new(titleBarInset >= 0 ? titleBarInset : 0);
RightPaddingColumn.Width = new(titleBarInset > 40 ? titleBarInset : 138);
HorizontalTabView.Measure(new(
HorizontalTabView.ActualWidth - TabBarAddNewTabButton.Width - titleBarInset,
HorizontalTabView.ActualHeight));
}
}
}
1 change: 1 addition & 0 deletions src/Files.App/Views/MainPage.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ private void UserSettingsService_OnSettingChangedEvent(object? sender, SettingCh
private void HorizontalMultitaskingControl_Loaded(object sender, RoutedEventArgs e)
{
TabControl.DragArea.SizeChanged += (_, _) => MainWindow.Instance.RaiseSetTitleBarDragRegion(SetTitleBarDragRegion);
TabControl.SizeChanged += (_, _) => MainWindow.Instance.RaiseSetTitleBarDragRegion(SetTitleBarDragRegion);
if (ViewModel.MultitaskingControl is not TabBar)
{
ViewModel.MultitaskingControl = TabControl;
Expand Down