Fix menu components not being clickable.
This commit is contained in:
parent
54f128777f
commit
604511d8e9
@ -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);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -39,7 +39,7 @@ All rights reserved.
|
|||||||
#define VERSION_MAJOR 0
|
#define VERSION_MAJOR 0
|
||||||
#define VERSION_MINOR 2
|
#define VERSION_MINOR 2
|
||||||
#define VERSION_PATCH 1
|
#define VERSION_PATCH 1
|
||||||
#define VERSION_BUILD 5944
|
#define VERSION_BUILD 5947
|
||||||
|
|
||||||
#define stringify(a) stringify_(a)
|
#define stringify(a) stringify_(a)
|
||||||
#define stringify_(a) #a
|
#define stringify_(a) #a
|
||||||
|
Loading…
x
Reference in New Issue
Block a user