mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-06-19 11:11:33 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2334 from akortunov/guifixes

Browse source 
Update background texture if a new one is empty (regression #4986)
This commit is contained in:
Alexei Dobrohotov 2019-04-20 21:46:26 +03:00 committed by GitHub
commit 0fac28563c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
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,12 +165,12 @@ namespace MWGui
} }
else else
scale = found->second; scale = found->second;
}
if (state == Barter && !isMagic) if (state == Barter && !isMagic)
setFrame(backgroundTex, MyGUI::IntCoord(2*scale,2*scale,44*scale,44*scale)); setFrame(backgroundTex, MyGUI::IntCoord(2*scale,2*scale,44*scale,44*scale));
else else
setFrame(backgroundTex, MyGUI::IntCoord(0,0,44*scale,44*scale)); setFrame(backgroundTex, MyGUI::IntCoord(0,0,44*scale,44*scale));
}
setIcon(ptr); setIcon(ptr);
} }