minetest-stuffs/dragonfire-client-dragonfire
1
0
Fork 0
Code Issues 10 Pull Requests 2 Packages Projects Releases 3 Wiki Activity

Fix background formspec elements from interfering with each other

Browse Source 
Fixes #4397
This commit is contained in:
rubenwardy
2016-08-07 14:32:31 +01:00
parent fbe4a9267f
commit 78ff5c1936
2 changed files with 34 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/guiFormSpecMenu.h
View File

@@ -143,9 +143,10 @@ class GUIFormSpecMenu : public GUIModalMenu
struct ImageDrawSpec
{
ImageDrawSpec():
parent_button(NULL)
{
}
parent_button(NULL),
clip(false)
{}
ImageDrawSpec(const std::string &a_name,
const std::string &a_item_name,
gui::IGUIButton *a_parent_button,
@@ -155,9 +156,10 @@ class GUIFormSpecMenu : public GUIModalMenu
parent_button(a_parent_button),
pos(a_pos),
geom(a_geom),
scale(true)
{
}
scale(true),
clip(false)
{}
ImageDrawSpec(const std::string &a_name,
const std::string &a_item_name,
const v2s32 &a_pos, const v2s32 &a_geom):
@@ -166,32 +168,36 @@ class GUIFormSpecMenu : public GUIModalMenu
parent_button(NULL),
pos(a_pos),
geom(a_geom),
scale(true)
{
}
scale(true),
clip(false)
{}
ImageDrawSpec(const std::string &a_name,
const v2s32 &a_pos, const v2s32 &a_geom):
const v2s32 &a_pos, const v2s32 &a_geom, bool clip=false):
name(a_name),
parent_button(NULL),
pos(a_pos),
geom(a_geom),
scale(true)
{
}
scale(true),
clip(clip)
{}
ImageDrawSpec(const std::string &a_name,
const v2s32 &a_pos):
name(a_name),
parent_button(NULL),
pos(a_pos),
scale(false)
{
}
scale(false),
clip(false)
{}
std::string name;
std::string item_name;
gui::IGUIButton *parent_button;
v2s32 pos;
v2s32 geom;
bool scale;
bool clip;
};
struct FieldSpec
@@ -428,7 +434,6 @@ protected:
bool m_bgfullscreen;
bool m_slotborder;
bool m_clipbackground;
video::SColor m_bgcolor;
video::SColor m_slotbg_n;
video::SColor m_slotbg_h;