mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-04 03:40:14 +00:00
Code Issues Projects Releases Wiki Activity

Update background texture if a new one is empty (regression #4986)

Browse Source
This commit is contained in:
Andrei Kortunov 2019-04-20 11:40:42 +04:00
parent 8cb4898ae7
commit 09686d684e
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
apps/openmw/mwgui/itemwidget.cpp
View File

@ -148,9 +148,9 @@ namespace MWGui
if (backgroundTex != "") if (backgroundTex != "")
backgroundTex += ".dds"; backgroundTex += ".dds";
float scale = 1.f;
if (!backgroundTex.empty()) if (!backgroundTex.empty())
{ {
float scale = 1.f;
auto found = mScales.find(backgroundTex); auto found = mScales.find(backgroundTex);
if (found == mScales.end()) if (found == mScales.end())
{ {
@ -165,13 +165,13 @@ namespace MWGui
} }
else else
scale = found->second; scale = found->second;
if (state == Barter && !isMagic)
setFrame(backgroundTex, MyGUI::IntCoord(2*scale,2*scale,44*scale,44*scale));
else
setFrame(backgroundTex, MyGUI::IntCoord(0,0,44*scale,44*scale));
} }
if (state == Barter && !isMagic)
setFrame(backgroundTex, MyGUI::IntCoord(2*scale,2*scale,44*scale,44*scale));
else
setFrame(backgroundTex, MyGUI::IntCoord(0,0,44*scale,44*scale));
setIcon(ptr); setIcon(ptr);
} }