Aren/haiku
1
0
Fork 0
Code Issues Pull Requests 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 <waddlesplash@gmail.com>
This commit is contained in:
Adrien Destugues 2020-05-15 19:39:30 +02:00 committed by waddlesplash
parent 6bd96c5234
commit eb4b3f721d
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/apps/deskbar/ExpandoMenuBar.cpp
View File

@ -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<TBarApp*>(be_app)->Settings()->superExpando) {
TTeamMenuItem* lastItem
= dynamic_cast<TTeamMenuItem*>(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<TBarApp*>(be_app)->Settings()->superExpando
&& lastItem != NULL && lastItem->ExpanderBounds().Contains(where)) {
lastItem->ToggleExpandState(true);
lastItem->SetArrowDirection(lastItem->IsExpanded()
? BControlLook::B_DOWN_ARROW