mirrors
/
OpenLoco
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Implement the last company window function (#1077) 

* Implement the last company window function

* Rename

* Remove pointless loop

* Fix off by 2 error
This commit is contained in:
Duncan 2021-08-08 20:42:28 +01:00 committed by GitHub
parent 4e3f77a1d9
commit bd794b21dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/OpenLoco/Windows/CompanyWindow.cpp
View File

@ -19,6 +19,7 @@
#include "../OpenLoco.h"
#include "../Scenario.h"
#include "../Ui/Dropdown.h"
#include "../Ui/ScrollView.h"
#include "../Ui/WindowManager.h"
#include "../Vehicles/Vehicle.h"
#include "../ViewportManager.h"
@ -1990,11 +1991,29 @@ namespace OpenLoco::Ui::Windows::CompanyWindow
}
}
static void sub_4C8DBF(Window* self)
// 0x004C8DBF
// For the finances the most recent data on the scroll view is the data
// most off to the right of the scroll. This function moves to the last
// page of data as far to the right of the scroll.
static void scrollToLatestData(Window* self)
{
registers regs;
regs.esi = X86Pointer(self);
call(0x004C8DBF, regs);
self->initScrollWidgets();
self->scroll_areas[0].contentOffsetX = 0x7FFF;
self->scroll_areas[0].contentWidth = 0;
self->updateScrollWidgets();
const Ui::Widget& widget = self->widgets[widx::scrollview];
const auto x = std::max<int16_t>(0, self->scroll_areas[0].contentOffsetX);
auto widgetWidth = widget.width() - 2;
if (self->scroll_areas[0].flags & ScrollView::ScrollFlags::vscrollbarVisible)
{
widgetWidth -= ScrollView::barWidth;
}
// This gets the offset of the last full page (widgetWidth) of the scroll view
const auto newOffset = std::max(0, self->scroll_areas[0].contentWidth - widgetWidth);
self->scroll_areas[0].contentOffsetX = std::min<int16_t>(x, newOffset);
ScrollView::updateThumbs(self, widx::scrollview);
}
// 0x00433868
@ -2003,7 +2022,7 @@ namespace OpenLoco::Ui::Windows::CompanyWindow
if (widgetIndex == Common::widx::company_select)
{
Common::switchCompany(self, itemIndex);
sub_4C8DBF(self);
scrollToLatestData(self);
self->invalidate();
}
}
@ -2089,7 +2108,7 @@ namespace OpenLoco::Ui::Windows::CompanyWindow
Common::disableChallengeTab(window);
window->initScrollWidgets();
window->moveInsideScreenEdges();
Finances::sub_4C8DBF(window);
Finances::scrollToLatestData(window);
return window;
}
@ -2621,7 +2640,7 @@ namespace OpenLoco::Ui::Windows::CompanyWindow
self->moveInsideScreenEdges();
if (tabInfo.widgetIndex == widx::tab_finances)
Finances::sub_4C8DBF(self);
Finances::scrollToLatestData(self);
}
// 0x0043252E