i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Check that expander is enabled before expanding items.

Browse Source 
Fixes #16025

Change-Id: Ia69fa23ba8044c0ea14f9b669c13636e087a203d
Reviewed-on: https://review.haiku-os.org/c/haiku/+/2702
Reviewed-by: waddlesplash <[email protected]>
This commit is contained in:
Adrien Destugues
2020-05-15 21:44:58 +00:00
committed by waddlesplash
parent 6bd96c5234
commit eb4b3f721d
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/deskbar/ExpandoMenuBar.cpp
+4 -2
View File
@@ -359,7 +359,8 @@ TExpandoMenuBar::MouseMoved(BPoint where, uint32 code, const BMessage* message)
// force a cleanup // force a cleanup
_FinishedDrag(); _FinishedDrag();
if (buttons != 0) { if (Vertical() && buttons != 0
&& static_cast<TBarApp*>(be_app)->Settings()->superExpando) {
TTeamMenuItem* lastItem TTeamMenuItem* lastItem
= dynamic_cast<TTeamMenuItem*>(fLastClickedItem); = dynamic_cast<TTeamMenuItem*>(fLastClickedItem);
if (lastItem != NULL) { if (lastItem != NULL) {
@@ -490,7 +491,8 @@ TExpandoMenuBar::MouseUp(BPoint where)
// absorb the message // absorb the message
} }
if (lastItem != NULL && lastItem->ExpanderBounds().Contains(where)) { if (Vertical() && static_cast<TBarApp*>(be_app)->Settings()->superExpando
&& lastItem != NULL && lastItem->ExpanderBounds().Contains(where)) {
lastItem->ToggleExpandState(true); lastItem->ToggleExpandState(true);
lastItem->SetArrowDirection(lastItem->IsExpanded() lastItem->SetArrowDirection(lastItem->IsExpanded()
? BControlLook::B_DOWN_ARROW ? BControlLook::B_DOWN_ARROW