Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Activate the driver when getting a show event, and clear the GUI Editor display widget when there's no GUI loaded.

Browse source 
--HG--
branch : gsoc2014-dfighter
This commit is contained in:
dfighter1985 2014-06-15 19:28:57 +02:00
parent f8505429ee
commit e5921ffd64
3 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
code/studio/src/plugins/gui_editor/nel3d_widget.cpp
View file

@ -102,6 +102,13 @@ namespace GUIEditor
driver->swapBuffers(); driver->swapBuffers();
} }
void Nel3DWidget::showEvent( QShowEvent *evnt )
{
QWidget::showEvent( evnt );
if( driver != NULL )
driver->activate();
}
#if defined ( NL_OS_WINDOWS ) #if defined ( NL_OS_WINDOWS )

2
code/studio/src/plugins/gui_editor/nel3d_widget.h
View file

@ -55,6 +55,8 @@ namespace GUIEditor
protected: protected:
void showEvent( QShowEvent *evnt );
#if defined(NL_OS_WINDOWS) #if defined(NL_OS_WINDOWS)
virtual bool winEvent( MSG *message, long *result ); virtual bool winEvent( MSG *message, long *result );
#elif defined(NL_OS_MAC) #elif defined(NL_OS_MAC)

4
code/studio/src/plugins/gui_editor/nelgui_ctrl.cpp
View file

@ -153,6 +153,10 @@ namespace GUIEditor
w->getDriver()->EventServer.pump(); w->getDriver()->EventServer.pump();
draw(); draw();
} }
else
{
w->clear();
}
} }
} }