From 6123d2dd9bf8ed45a305137a60943a3981f2aaf8 Mon Sep 17 00:00:00 2001 From: John Scipione Date: Sat, 7 Oct 2017 01:47:16 -0700 Subject: [PATCH] Deskbar: Move tray past border in horizontal mode Fixes #13711 --- src/apps/deskbar/BarView.cpp | 3 +++ src/apps/deskbar/StatusView.cpp | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/apps/deskbar/BarView.cpp b/src/apps/deskbar/BarView.cpp index 2d8b93b166..8f57856dcd 100644 --- a/src/apps/deskbar/BarView.cpp +++ b/src/apps/deskbar/BarView.cpp @@ -469,6 +469,9 @@ TBarView::PlaceTray(bool vertSwap, bool leftSwap) } else { if (!fResizeControl->IsHidden()) fResizeControl->Hide(); + // move right and down to not cover border then resize to fit + fReplicantTray->MoveTo(kGutter, kGutter); + fReplicantTray->ResizeBy(-kGutter, -kGutter); BRect screenFrame = (BScreen(Window())).Frame(); statusLoc.x = screenFrame.right - fDragRegion->Bounds().Width(); statusLoc.y = -1; diff --git a/src/apps/deskbar/StatusView.cpp b/src/apps/deskbar/StatusView.cpp index 13b6e035bd..df972af2f9 100644 --- a/src/apps/deskbar/StatusView.cpp +++ b/src/apps/deskbar/StatusView.cpp @@ -1160,7 +1160,7 @@ TReplicantTray::LocationForReplicant(int32 index, float width) if (fBarView->Vertical() && !fBarView->Left()) loc.x += kDragWidth; else if (!fBarView->Vertical()) - loc.x += 2; + loc.x += kGutter; if (fMultiRowMode) { // try to find free space in every row