FGFS-4.1/simgear
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

canvas::NasalWidget: check for empty setGeometry callback.

Browse Source
This commit is contained in:
Thomas Geymayer 2014-07-20 23:31:32 +02:00
parent 6af8d32078
commit 726a4c6d10
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
simgear/canvas/layout/NasalWidget.cxx
View File

@ -19,6 +19,7 @@
#include "NasalWidget.hxx"
#include <simgear/canvas/Canvas.hxx>
#include <simgear/nasal/cppbind/NasalContext.hxx>
#include <simgear/nasal/cppbind/Ghost.hxx>
namespace simgear
@ -56,13 +57,17 @@ namespace canvas
void NasalWidget::setGeometry(const SGRect<int>& geom)
{
if( _geometry != geom )
{
_geometry = geom;
else if( !(_flags & LAYOUT_DIRTY) || !_set_geometry )
_flags |= LAYOUT_DIRTY;
}
if( !_set_geometry || !(_flags & LAYOUT_DIRTY) )
return;
naContext c = naNewContext();
try
{
nasal::Context c;
_set_geometry(nasal::to_nasal(c, this), geom);
_flags &= ~LAYOUT_DIRTY;
}
@ -74,7 +79,6 @@ namespace canvas
"NasalWidget::setGeometry: callback error: '" << ex.what() << "'"
);
}
naFreeContext(c);
}
//----------------------------------------------------------------------------