|
1 | 1 | using System; |
2 | 2 | using System.IO; |
| 3 | +using System.Linq; |
3 | 4 |
|
4 | 5 | using Avalonia; |
5 | 6 | using Avalonia.Controls; |
| 7 | +using Avalonia.Controls.Primitives; |
6 | 8 | using Avalonia.Input; |
7 | 9 | using Avalonia.Interactivity; |
| 10 | +using Avalonia.Layout; |
8 | 11 | using Avalonia.Media; |
9 | 12 | using Avalonia.Styling; |
| 13 | +using Avalonia.VisualTree; |
10 | 14 |
|
11 | 15 | namespace SourceGit.Views |
12 | 16 | { |
@@ -254,11 +258,167 @@ private async void OnPointerMovedOverTab(object sender, PointerEventArgs e) |
254 | 258 |
|
255 | 259 | var data = new DataTransfer(); |
256 | 260 | data.Add(DataTransferItem.Create(_dndMainTabFormat, page.Node.Id)); |
257 | | - await DragDrop.DoDragDropAsync(_pressedTabEvent, data, DragDropEffects.Move); |
| 261 | + try |
| 262 | + { |
| 263 | + BeginDragFeedback(border, page); |
| 264 | + await DragDrop.DoDragDropAsync(_pressedTabEvent, data, DragDropEffects.Move); |
| 265 | + } |
| 266 | + finally |
| 267 | + { |
| 268 | + ClearDragFeedback(); |
| 269 | + _pressedTabEvent = null; |
| 270 | + _startDragTab = false; |
| 271 | + } |
258 | 272 | } |
259 | 273 | e.Handled = true; |
260 | 274 | } |
261 | 275 |
|
| 276 | + private void BeginDragFeedback(Border source, ViewModels.LauncherPage page) |
| 277 | + { |
| 278 | + _draggedPage = page; |
| 279 | + _dragSource = source; |
| 280 | + _dragLayer = AdornerLayer.GetAdornerLayer(this); |
| 281 | + if (_dragLayer != null) |
| 282 | + { |
| 283 | + var size = source.Bounds.Size; |
| 284 | + var text = source.GetVisualDescendants().OfType<TextBlock>().FirstOrDefault(t => t.IsEffectivelyVisible); |
| 285 | + var icon = page.Node.IsRepository |
| 286 | + ? (Control)new Bookmark { Value = page.Node.Bookmark } |
| 287 | + : new Avalonia.Controls.Shapes.Path |
| 288 | + { |
| 289 | + Data = this.FindResource("Icons.Repositories") as Geometry, |
| 290 | + Fill = this.FindResource("Brush.FG1") as IBrush |
| 291 | + }; |
| 292 | + icon.Width = 12; |
| 293 | + icon.Height = 12; |
| 294 | + icon.Margin = new Thickness(0, 0, 8, 0); |
| 295 | + var content = new Grid |
| 296 | + { |
| 297 | + ColumnDefinitions = new ColumnDefinitions("Auto,*"), |
| 298 | + Margin = new Thickness(12, 0), |
| 299 | + VerticalAlignment = VerticalAlignment.Center |
| 300 | + }; |
| 301 | + content.Children.Add(icon); |
| 302 | + var title = new TextBlock |
| 303 | + { |
| 304 | + Text = page.Node.IsRepository ? page.Node.Name : App.Text("PageTabBar.Welcome.Title"), |
| 305 | + FontFamily = text?.FontFamily ?? FontFamily.Default, |
| 306 | + FontSize = text?.FontSize ?? 12, |
| 307 | + Foreground = this.FindResource("Brush.FG1") as IBrush, |
| 308 | + TextTrimming = TextTrimming.CharacterEllipsis, |
| 309 | + VerticalAlignment = VerticalAlignment.Center |
| 310 | + }; |
| 311 | + Grid.SetColumn(title, 1); |
| 312 | + content.Children.Add(title); |
| 313 | + _dragPreview = new Border |
| 314 | + { |
| 315 | + Width = size.Width, |
| 316 | + Height = size.Height, |
| 317 | + Background = this.FindResource("Brush.ToolBar") as IBrush, |
| 318 | + BorderBrush = this.FindResource("Brush.Border0") as IBrush, |
| 319 | + BorderThickness = new Thickness(1), |
| 320 | + CornerRadius = new CornerRadius(4), |
| 321 | + Opacity = 0.85, |
| 322 | + IsVisible = false, |
| 323 | + ClipToBounds = true, |
| 324 | + Child = content |
| 325 | + }; |
| 326 | + _dropIndicator = new Border |
| 327 | + { |
| 328 | + Width = 3, |
| 329 | + Height = Math.Max(0, size.Height - 4), |
| 330 | + Background = this.FindResource("Brush.Accent") as IBrush, |
| 331 | + IsVisible = false |
| 332 | + }; |
| 333 | + _dragOverlay = new Canvas { IsHitTestVisible = false }; |
| 334 | + _dragOverlay.Children.Add(_dropIndicator); |
| 335 | + _dragOverlay.Children.Add(_dragPreview); |
| 336 | + AdornerLayer.SetAdornedElement(_dragOverlay, this); |
| 337 | + AdornerLayer.SetIsClipEnabled(_dragOverlay, false); |
| 338 | + _dragLayer.Children.Add(_dragOverlay); |
| 339 | + } |
| 340 | + source.Classes.Add("tab_drag_source"); |
| 341 | + } |
| 342 | + |
| 343 | + private void DragOverTabs(object sender, DragEventArgs e) |
| 344 | + { |
| 345 | + if (_draggedPage == null || DataContext is not ViewModels.Launcher launcher) |
| 346 | + return; |
| 347 | + |
| 348 | + var point = e.GetPosition(this); |
| 349 | + if (_dragPreview != null) |
| 350 | + { |
| 351 | + Canvas.SetLeft(_dragPreview, point.X + 12); |
| 352 | + Canvas.SetTop(_dragPreview, point.Y + 12); |
| 353 | + _dragPreview.IsVisible = true; |
| 354 | + } |
| 355 | + |
| 356 | + ClearDropTarget(); |
| 357 | + e.DragEffects = DragDropEffects.None; |
| 358 | + var fromIndex = launcher.Pages.IndexOf(_draggedPage); |
| 359 | + if (fromIndex < 0 || !new Rect(LauncherTabsScroller.Bounds.Size).Contains(e.GetPosition(LauncherTabsScroller))) |
| 360 | + return; |
| 361 | + |
| 362 | + for (var i = 0; i < LauncherTabsList.ItemCount; i++) |
| 363 | + { |
| 364 | + var container = LauncherTabsList.ContainerFromIndex(i); |
| 365 | + var tab = container?.GetVisualDescendants().OfType<LauncherTabSizeBox>().FirstOrDefault(); |
| 366 | + if (tab == null || i == fromIndex) |
| 367 | + continue; |
| 368 | + |
| 369 | + var position = e.GetPosition(tab); |
| 370 | + if (!new Rect(tab.Bounds.Size).Contains(position)) |
| 371 | + continue; |
| 372 | + |
| 373 | + _dropTarget = tab; |
| 374 | + tab.Classes.Add("tab_drop_target"); |
| 375 | + e.DragEffects = DragDropEffects.Move; |
| 376 | + if (_dropIndicator != null && tab.TranslatePoint(new Point(i > fromIndex ? tab.Bounds.Width : 0, 2), this) is { } edge) |
| 377 | + { |
| 378 | + Canvas.SetLeft(_dropIndicator, edge.X - 1.5); |
| 379 | + Canvas.SetTop(_dropIndicator, edge.Y); |
| 380 | + _dropIndicator.IsVisible = true; |
| 381 | + } |
| 382 | + break; |
| 383 | + } |
| 384 | + e.Handled = true; |
| 385 | + } |
| 386 | + |
| 387 | + private void DragLeaveTabs(object sender, DragEventArgs e) |
| 388 | + { |
| 389 | + ClearDropTarget(); |
| 390 | + if (_dragPreview != null) |
| 391 | + _dragPreview.IsVisible = false; |
| 392 | + } |
| 393 | + |
| 394 | + private void ClearDropTarget() |
| 395 | + { |
| 396 | + _dropTarget?.Classes.Remove("tab_drop_target"); |
| 397 | + _dropTarget = null; |
| 398 | + if (_dropIndicator != null) |
| 399 | + _dropIndicator.IsVisible = false; |
| 400 | + } |
| 401 | + |
| 402 | + private void ClearDragFeedback() |
| 403 | + { |
| 404 | + ClearDropTarget(); |
| 405 | + _dragSource?.Classes.Remove("tab_drag_source"); |
| 406 | + if (_dragOverlay != null) |
| 407 | + _dragLayer?.Children.Remove(_dragOverlay); |
| 408 | + _draggedPage = null; |
| 409 | + _dragSource = null; |
| 410 | + _dragOverlay = null; |
| 411 | + _dragPreview = null; |
| 412 | + _dropIndicator = null; |
| 413 | + _dragLayer = null; |
| 414 | + } |
| 415 | + |
| 416 | + protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e) |
| 417 | + { |
| 418 | + ClearDragFeedback(); |
| 419 | + base.OnDetachedFromVisualTree(e); |
| 420 | + } |
| 421 | + |
262 | 422 | private void DropTab(object sender, DragEventArgs e) |
263 | 423 | { |
264 | 424 | if (e.DataTransfer.TryGetValue(_dndMainTabFormat) is not { Length: > 0 } id) |
@@ -286,6 +446,7 @@ private void DropTab(object sender, DragEventArgs e) |
286 | 446 | if (target == to) |
287 | 447 | return; |
288 | 448 |
|
| 449 | + ClearDragFeedback(); |
289 | 450 | launcher.MoveTab(target, to); |
290 | 451 |
|
291 | 452 | _pressedTabEvent = null; |
@@ -427,6 +588,13 @@ private void OnCloseTab(object sender, RoutedEventArgs e) |
427 | 588 | private readonly Vector _scrollStep = new(64, 0); |
428 | 589 | private PointerPressedEventArgs _pressedTabEvent = null; |
429 | 590 | private bool _startDragTab = false; |
| 591 | + private ViewModels.LauncherPage _draggedPage; |
| 592 | + private Border _dragSource; |
| 593 | + private LauncherTabSizeBox _dropTarget; |
| 594 | + private AdornerLayer _dragLayer; |
| 595 | + private Canvas _dragOverlay; |
| 596 | + private Border _dragPreview; |
| 597 | + private Border _dropIndicator; |
430 | 598 | private readonly DataFormat<string> _dndMainTabFormat = DataFormat.CreateStringApplicationFormat("sourcegit-dnd-main-tab"); |
431 | 599 | } |
432 | 600 | } |
0 commit comments