|
|
@ -68,6 +68,7 @@ namespace MWGui
|
|
|
|
, mPreview(new MWRender::InventoryPreview(parent, resourceSystem, MWMechanics::getPlayer()))
|
|
|
|
, mPreview(new MWRender::InventoryPreview(parent, resourceSystem, MWMechanics::getPlayer()))
|
|
|
|
, mTrading(false)
|
|
|
|
, mTrading(false)
|
|
|
|
, mScaleFactor(1.0f)
|
|
|
|
, mScaleFactor(1.0f)
|
|
|
|
|
|
|
|
, mUpdateTimer(0.f)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
float uiScale = Settings::Manager::getFloat("scaling factor", "GUI");
|
|
|
|
float uiScale = Settings::Manager::getFloat("scaling factor", "GUI");
|
|
|
|
if (uiScale > 1.0)
|
|
|
|
if (uiScale > 1.0)
|
|
|
@ -631,6 +632,22 @@ namespace MWGui
|
|
|
|
void InventoryWindow::onFrame(float dt)
|
|
|
|
void InventoryWindow::onFrame(float dt)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
updateEncumbranceBar();
|
|
|
|
updateEncumbranceBar();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (mPinned)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
mUpdateTimer += dt;
|
|
|
|
|
|
|
|
if (0.1f < mUpdateTimer)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
mUpdateTimer = 0;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// Update pinned inventory in-game
|
|
|
|
|
|
|
|
if (!MWBase::Environment::get().getWindowManager()->isGuiMode())
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
mItemView->update();
|
|
|
|
|
|
|
|
notifyContentChanged();
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void InventoryWindow::setTrading(bool trading)
|
|
|
|
void InventoryWindow::setTrading(bool trading)
|
|
|
|