minetest
/
minetest
mirror of https://github.com/minetest/minetest.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #279 from RealBadAngel/patch-2 

Formspec: Draw images before inventories. Allows to use image as backgro...
This commit is contained in:
PilzAdam 2012-11-05 08:12:12 -08:00
parent 23837e4352 8540871ebc
commit 8c3ffa3907
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/guiFormSpecMenu.cpp
View File

@ -692,17 +692,8 @@ void GUIFormSpecMenu::drawMenu()
m_tooltip_element->setVisible(false);
/*
Draw items
Phase 0: Item slot rectangles
Phase 1: Item images; prepare tooltip
Draw images
*/
for(int phase=0; phase<=1; phase++)
for(u32 i=0; i<m_inventorylists.size(); i++)
{
drawList(m_inventorylists[i], phase);
}
for(u32 i=0; i<m_images.size(); i++)
{
const ImageDrawSpec &spec = m_images[i];
@ -720,6 +711,17 @@ void GUIFormSpecMenu::drawMenu()
NULL/*&AbsoluteClippingRect*/, colors, true);
}
/*
Draw items
Phase 0: Item slot rectangles
Phase 1: Item images; prepare tooltip
*/
for(int phase=0; phase<=1; phase++)
for(u32 i=0; i<m_inventorylists.size(); i++)
{
drawList(m_inventorylists[i], phase);
}
/*
Draw dragged item stack
*/