oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-06-27 16:36:03 +00:00
Code Wiki Activity

Fixing warning pointed by @sfan5 and clang and cleanup guiFileSelectMenu

Browse source 
* Also pass clang-format on guiFileSelectMenu.h and remove it from whitelist
This commit is contained in:
Loic Blot 2017-04-22 00:51:13 +02:00
parent 4f4e2e3e83
commit 3e71c8f482
No known key found for this signature in database
GPG key ID: EFAA458E8C153987
5 changed files with 13 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/modalMenu.h
View file

@ -43,14 +43,13 @@ public:
class GUIModalMenu : public gui::IGUIElement
{
public:
GUIModalMenu(gui::IGUIEnvironment* env,
gui::IGUIElement* parent, s32 id,
GUIModalMenu(gui::IGUIEnvironment* env, gui::IGUIElement* parent, s32 id,
IMenuManager *menumgr):
IGUIElement(gui::EGUIET_ELEMENT, env, parent, id,
core::rect<s32>(0,0,100,100))
{
//m_force_regenerate_gui = false;
m_menumgr = menumgr;
m_allow_focus_removal = false;
m_screensize_old = v2u32(0,0);
@ -59,6 +58,7 @@ public:
Environment->setFocus(this);
m_menumgr->createdMenu(this);
}
virtual ~GUIModalMenu()
{
m_menumgr->deletingMenu(this);
@ -78,7 +78,7 @@ public:
{
if(!IsVisible)
return;
video::IVideoDriver* driver = Environment->getVideoDriver();
v2u32 screensize = driver->getScreenSize();
if(screensize != m_screensize_old /*|| m_force_regenerate_gui*/)
@ -90,7 +90,7 @@ public:
drawMenu();
}
/*
This should be called when the menu wants to quit.