Skip to content

Commit 2aab17e

Browse files
XTorLukasyaira2
andauthored
Code Quality: Follow up fixes for the title bar drag region (#16595)
Co-authored-by: Yair <39923744+yaira2@users.noreply.github.com>
1 parent 5629c8d commit 2aab17e

File tree

2 files changed

+11
-6
lines changed

2 files changed

+11
-6
lines changed

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

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -358,15 +358,19 @@ private void TabViewItem_Loaded(object sender, RoutedEventArgs e)
358358
}
359359
}
360360

361-
private void DragAreaRectangle_Loaded(object sender, RoutedEventArgs e)
361+
private async void DragAreaRectangle_Loaded(object sender, RoutedEventArgs e)
362362
{
363-
double scaleAdjustment = DragAreaRectangle.XamlRoot.RasterizationScale;
364-
double titleBarInset = ((FilePropertiesHelpers.FlowDirectionSettingIsRightToLeft
363+
if (HorizontalTabView.ActualWidth <= 0 && TabBarAddNewTabButton.Width <= 0)
364+
await Task.Delay(100);
365+
366+
var titleBarInset = ((FilePropertiesHelpers.FlowDirectionSettingIsRightToLeft
365367
? MainWindow.Instance.AppWindow.TitleBar.LeftInset
366-
: MainWindow.Instance.AppWindow.TitleBar.RightInset) / scaleAdjustment) + 40;
368+
: MainWindow.Instance.AppWindow.TitleBar.RightInset) / DragAreaRectangle.XamlRoot.RasterizationScale) + 40;
367369

368-
HorizontalTabView.Measure(new(HorizontalTabView.ActualWidth - TabBarAddNewTabButton.Width - titleBarInset, HorizontalTabView.ActualHeight));
369-
RightPaddingColumn.Width = new(titleBarInset >= 0 ? titleBarInset : 0);
370+
RightPaddingColumn.Width = new(titleBarInset > 40 ? titleBarInset : 138);
371+
HorizontalTabView.Measure(new(
372+
HorizontalTabView.ActualWidth - TabBarAddNewTabButton.Width - titleBarInset,
373+
HorizontalTabView.ActualHeight));
370374
}
371375
}
372376
}

src/Files.App/Views/MainPage.xaml.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ private void UserSettingsService_OnSettingChangedEvent(object? sender, SettingCh
127127
private void HorizontalMultitaskingControl_Loaded(object sender, RoutedEventArgs e)
128128
{
129129
TabControl.DragArea.SizeChanged += (_, _) => MainWindow.Instance.RaiseSetTitleBarDragRegion(SetTitleBarDragRegion);
130+
TabControl.SizeChanged += (_, _) => MainWindow.Instance.RaiseSetTitleBarDragRegion(SetTitleBarDragRegion);
130131
if (ViewModel.MultitaskingControl is not TabBar)
131132
{
132133
ViewModel.MultitaskingControl = TabControl;

0 commit comments

Comments
 (0)