|
|
@ -148,8 +148,8 @@ void Menu::HoverMenuSelect(AiL*game){ |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
void Menu::MenuSelect(AiL*game){ |
|
|
|
void Menu::MenuSelect(AiL*game){ |
|
|
|
if(!game->IsFocused()||selection.expired()||(selection.lock()->disabled||selection.lock()->grayedOut))return; |
|
|
|
if(!game->IsFocused()||selection.expired()||selection.lock()->disabled||selection.lock()->grayedOut)return; |
|
|
|
bool buttonStillValid=selection.lock()->onClick(MenuFuncData{*this,game,selection,DYNAMIC_POINTER_CAST<ScrollableWindowComponent>(selection.lock()->parentComponent.lock())}); |
|
|
|
bool buttonStillValid=selection.lock()->onClick(MenuFuncData{*this,game,selection,dynamic_pointer_cast<ScrollableWindowComponent>(selection.lock()->parentComponent.lock())}); |
|
|
|
if(buttonStillValid){ |
|
|
|
if(buttonStillValid){ |
|
|
|
if(selection.lock()->menuDest!=MenuType::ENUM_END){ |
|
|
|
if(selection.lock()->menuDest!=MenuType::ENUM_END){ |
|
|
|
if(stack.size()<32){ |
|
|
|
if(stack.size()<32){ |
|
|
@ -162,7 +162,7 @@ void Menu::MenuSelect(AiL*game){ |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
void Menu::Update(AiL*game){ |
|
|
|
void Menu::Update(AiL*game){ |
|
|
|
if(draggingComponent){ |
|
|
|
if(!draggingComponent){ |
|
|
|
HoverMenuSelect(game); |
|
|
|
HoverMenuSelect(game); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|