sigonasr2
/
AdventuresInLestoria
1
1
Fork 0
Code Issues 9 Pull Requests Projects 1 Releases Wiki Activity

Fix scrollbar boundary not updating upon switching to new menus. Fix bug with positions from keyboard/button maps not using original positions in scrollable components.

Browse Source
pull/28/head
sigonasr2 12 months ago
parent 3251053364
commit 46926be340
6 changed files with 22 additions and 36 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      Crawler/CharacterMenuWindow.cpp
  2. 1
      Crawler/Crawler.cpp
  3. 2
      Crawler/InventoryScrollableWindowComponent.h
  4. 42
      Crawler/ScrollableWindowComponent.h
  5. 2
      Crawler/Version.h
  6. 9
      Crawler/assets/config/items/ItemDatabase.txt

2
Crawler/CharacterMenuWindow.cpp
Unescape View File

@ -135,7 +135,7 @@ void Menu::InitializeCharacterMenuWindow(){
equipList->RemoveAllComponents();
for(int counter=0;Item&it:availableEquipment){
Item&itemInvRef=Inventory::GetItem(it.Name());
auto equip=equipList->ADD("Equip Item "+std::to_string(counter),RowItemDisplay)({{2,2+counter*28.f},{120-12,28}},itemInvRef,
auto equip=equipList->ADD("Equip Item "+std::to_string(counter),RowItemDisplay)({{2,2+counter*28.f},{120-15,28}},itemInvRef,
[](MenuFuncData data){
RowItemDisplay*comp=dynamic_cast<RowItemDisplay*>(data.component);
if(comp!=nullptr){

1
Crawler/Crawler.cpp
Unescape View File

@ -196,6 +196,7 @@ bool Crawler::OnUserCreate(){
Inventory::AddItem("Copper Pants");
Inventory::AddItem("Shell Helmet");
Inventory::AddItem("Shell Armor");
Inventory::AddItem("Bone Armor");
Inventory::AddItem("Shell Gloves");
Inventory::AddItem("Shell Shoes");
Inventory::AddItem("Bone Pants");

2
Crawler/InventoryScrollableWindowComponent.h
Unescape View File

@ -117,7 +117,7 @@ protected:
i--; //Subtract one from the index so we don't accidently skip slots.
}
}
bounds=CalculateBounds(); //Recalculate the bounds as it's possible the width/height of the component has changed.
CalculateBounds(); //Recalculate the bounds as it's possible the width/height of the component has changed.
}
virtual inline void OnInventorySlotsUpdate(ITCategory cat)override{
size_t invSize=Inventory::get(cat).size();

42
Crawler/ScrollableWindowComponent.h
Unescape View File

@ -71,8 +71,8 @@ public:
}
}
virtual inline void RemoveButton(MenuComponent*button){
std::vector<MenuComponent*>&buttonList=Menu::menus[button->parentMenu]->buttons.at(int(button->GetPos().y));
std::vector<MenuComponent*>&keyboardButtonList=Menu::menus[button->parentMenu]->keyboardButtons.at(int(button->GetPos().y));
std::vector<MenuComponent*>&buttonList=Menu::menus[button->parentMenu]->buttons.at(int(button->originalPos.y));
std::vector<MenuComponent*>&keyboardButtonList=Menu::menus[button->parentMenu]->keyboardButtons.at(int(button->originalPos.y));
size_t removedCount=0;
removedCount+=std::erase(buttonList,button);
removedCount+=std::erase(keyboardButtonList,button);
@ -80,19 +80,20 @@ public:
std::cout<<"WARNING! Attempted to remove buttons from button listing, but not found!";
}
if(buttonList.size()==0){
if(!Menu::menus[button->parentMenu]->buttons.erase(int(button->GetPos().y))){
ERR("WARNING! Attempted to erase key "<<button->GetPos().y<<" from button map, but the list still exists!")
if(!Menu::menus[button->parentMenu]->buttons.erase(int(button->originalPos.y))){
ERR("WARNING! Attempted to erase key "<<button->originalPos.y<<" from button map, but the list still exists!")
}
}
if(keyboardButtonList.size()==0){
if(!Menu::menus[button->parentMenu]->keyboardButtons.erase(int(button->GetPos().y))){
ERR("WARNING! Attempted to erase key "<<button->GetPos().y<<" from button map, but the list still exists!")
if(!Menu::menus[button->parentMenu]->keyboardButtons.erase(int(button->originalPos.y))){
ERR("WARNING! Attempted to erase key "<<button->originalPos.y<<" from button map, but the list still exists!")
}
}
Menu::menus[button->parentMenu]->components.erase(button->GetName());
components.erase(std::find(components.begin(),components.end(),button));
Menu::menus[button->parentMenu]->RecalculateComponentCount();
delete button;
CalculateBounds();
}
virtual inline void SetScrollAmount(vf2d scrollOffset){
this->scrollOffset=scrollOffset;
@ -106,8 +107,8 @@ public:
protected:
virtual inline void AfterCreate()override{
//Let's use the internal name of this component to add unique names for sub-components.
upButton=Menu::menus[parentMenu]->ADD(name+vf2d(rect.pos+vf2d{rect.size.x-12,0}).str()+"_"+vf2d(12,12).str(),MenuComponent)({rect.pos+vf2d{rect.size.x-12,0},{12,12}},"^",[&](MenuFuncData dat){SetScrollAmount(GetScrollAmount()+vf2d{0,"ThemeGlobal.MenuButtonScrollSpeed"_F});return true;},ButtonAttr::UNSELECTABLE_VIA_KEYBOARD)DEPTH -1 END;
downButton=Menu::menus[parentMenu]->ADD(name+vf2d(rect.pos+rect.size-vf2d{12,12}).str()+"_"+vf2d(12,12).str(),MenuComponent)({rect.pos+rect.size-vf2d{12,12},{12,12}},"v",[&](MenuFuncData dat){SetScrollAmount(GetScrollAmount()-vf2d{0,"ThemeGlobal.MenuButtonScrollSpeed"_F});return true;},ButtonAttr::UNSELECTABLE_VIA_KEYBOARD)DEPTH -1 END;
upButton=Menu::menus[parentMenu]->ADD(name+vf2d(rect.pos+vf2d{rect.size.x-12,0}).str()+"_"+vf2d(12,12).str(),MenuComponent)({rect.pos+vf2d{rect.size.x-12,0},{12,12}},"^",[&](MenuFuncData dat){SetScrollAmount(GetScrollAmount()+vf2d{0,"ThemeGlobal.MenuButtonScrollSpeed"_F});return true;},ButtonAttr::UNSELECTABLE_VIA_KEYBOARD)DEPTH depth-1 END;
downButton=Menu::menus[parentMenu]->ADD(name+vf2d(rect.pos+rect.size-vf2d{12,12}).str()+"_"+vf2d(12,12).str(),MenuComponent)({rect.pos+rect.size-vf2d{12,12},{12,12}},"v",[&](MenuFuncData dat){SetScrollAmount(GetScrollAmount()-vf2d{0,"ThemeGlobal.MenuButtonScrollSpeed"_F});return true;},ButtonAttr::UNSELECTABLE_VIA_KEYBOARD)DEPTH depth-1 END;
subWindow=ViewPort::rectViewPort({},rect.size,Menu::menus[parentMenu]->pos+rect.pos);
if(upButton){upButton->Enable(!disabled);}
if(downButton){downButton->Enable(!disabled);}
@ -137,7 +138,6 @@ protected:
float spaceBetweenTopAndBottomArrows=rect.size.y-24;
float viewHeight=rect.size.y;
float totalContentHeight=bounds.size.y;
if(totalContentHeight==0)totalContentHeight=1;
float scrollBarScale=(spaceBetweenTopAndBottomArrows/totalContentHeight);
@ -205,8 +205,8 @@ protected:
return geom2d::overlaps(geom2d::rect<float>{Menu::menus[parentMenu]->pos+rect.pos+child->rect.pos,child->rect.size},game->GetMousePos());
}
//Calculates the bounds of all components.
geom2d::rect<float> inline CalculateBounds(){
geom2d::rect<float>bounds;
inline void CalculateBounds(){
bounds={};
for(MenuComponent*component:components){
if(component->rect.pos.x<bounds.pos.x){
float sizeIncrease=bounds.pos.x-component->rect.pos.x;
@ -227,7 +227,6 @@ protected:
bounds.size.y+=sizeIncrease;
}
}
return bounds;
}
public:
template<class T>
@ -236,24 +235,7 @@ public:
button->renderInMain=false; //Now we are in control!
button->parentComponent=this;
if(button->rect.pos.x<bounds.pos.x){
float sizeIncrease=bounds.pos.x-button->rect.pos.x;
bounds.size.x+=sizeIncrease;
bounds.pos.x=button->rect.pos.x;
}
if(button->rect.right().start.x>bounds.right().start.x){
float sizeIncrease=button->rect.right().start.x-bounds.right().start.x;
bounds.size.x+=sizeIncrease;
}
if(button->rect.pos.y<bounds.pos.y){
float sizeIncrease=bounds.pos.y-button->rect.pos.y;
bounds.size.y+=sizeIncrease;
bounds.pos.y=button->rect.pos.y;
}
if(button->rect.bottom().start.y>bounds.bottom().start.y){
float sizeIncrease=button->rect.bottom().start.y-bounds.bottom().start.y;
bounds.size.y+=sizeIncrease;
}
CalculateBounds();
Menu::menus[parentMenu]->_AddComponent(key,button);
return button;

2
Crawler/Version.h
Unescape View File

@ -39,7 +39,7 @@ All rights reserved.
#define VERSION_MAJOR 0
#define VERSION_MINOR 2
#define VERSION_PATCH 1
#define VERSION_BUILD 4009
#define VERSION_BUILD 4019
#define stringify(a) stringify_(a)
#define stringify_(a) #a

9
Crawler/assets/config/items/ItemDatabase.txt
Unescape View File

@ -113,7 +113,8 @@ ItemDatabase
ItemScript = Restore
HP Restore = 1
Description = Does nothing apparently.
ItemCategory = Consumables
ItemCategory = Equipment
Slot = Armor
Cooldown Time = 5.0
Cast Time = 0.0
}
@ -122,7 +123,8 @@ ItemDatabase
ItemScript = Restore
HP Restore = 1
Description = Does nothing apparently.
ItemCategory = Consumables
ItemCategory = Equipment
Slot = Armor
Cooldown Time = 5.0
Cast Time = 0.0
}
@ -131,7 +133,8 @@ ItemDatabase
ItemScript = Restore
HP Restore = 1
Description = Does nothing apparently.
ItemCategory = Consumables
ItemCategory = Equipment
Slot = Armor
Cooldown Time = 5.0
Cast Time = 0.0
}

Write Preview
Loading…
Cancel
Save