From eb4b3f721d82cc4c056e17b0caaea4f31ea53791 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Fri, 15 May 2020 19:39:30 +0200 Subject: [PATCH] Check that expander is enabled before expanding items. Fixes #16025 Change-Id: Ia69fa23ba8044c0ea14f9b669c13636e087a203d Reviewed-on: https://review.haiku-os.org/c/haiku/+/2702 Reviewed-by: waddlesplash --- src/apps/deskbar/ExpandoMenuBar.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/apps/deskbar/ExpandoMenuBar.cpp b/src/apps/deskbar/ExpandoMenuBar.cpp index ad21595158..fa3eca64a1 100644 --- a/src/apps/deskbar/ExpandoMenuBar.cpp +++ b/src/apps/deskbar/ExpandoMenuBar.cpp @@ -359,7 +359,8 @@ TExpandoMenuBar::MouseMoved(BPoint where, uint32 code, const BMessage* message) // force a cleanup _FinishedDrag(); - if (buttons != 0) { + if (Vertical() && buttons != 0 + && static_cast(be_app)->Settings()->superExpando) { TTeamMenuItem* lastItem = dynamic_cast(fLastClickedItem); if (lastItem != NULL) { @@ -490,7 +491,8 @@ TExpandoMenuBar::MouseUp(BPoint where) // absorb the message } - if (lastItem != NULL && lastItem->ExpanderBounds().Contains(where)) { + if (Vertical() && static_cast(be_app)->Settings()->superExpando + && lastItem != NULL && lastItem->ExpanderBounds().Contains(where)) { lastItem->ToggleExpandState(true); lastItem->SetArrowDirection(lastItem->IsExpanded() ? BControlLook::B_DOWN_ARROW