fly/flightgear
1
0
Fork 0
Code Activity

Nasal: expose Canvas SpaceItem directly

Browse source 
Allow a SpacerItem to be explicitly created.
This commit is contained in:
James Turner 2022-03-06 20:05:32 +00:00
parent 77501672df
commit 52731a7c04
1 changed files with 23 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/Scripting/NasalCanvas.cxx
View file

@ -40,6 +40,7 @@
#include <simgear/canvas/layout/BoxLayout.hxx> #include <simgear/canvas/layout/BoxLayout.hxx>
#include <simgear/canvas/layout/GridLayout.hxx> #include <simgear/canvas/layout/GridLayout.hxx>
#include <simgear/canvas/layout/NasalWidget.hxx> #include <simgear/canvas/layout/NasalWidget.hxx>
#include <simgear/canvas/layout/SpacerItem.hxx>
#include <simgear/nasal/cppbind/from_nasal.hxx> #include <simgear/nasal/cppbind/from_nasal.hxx>
#include <simgear/nasal/cppbind/to_nasal.hxx> #include <simgear/nasal/cppbind/to_nasal.hxx>
@ -77,6 +78,7 @@ typedef nasal::Ghost<sc::LayoutItemRef> NasalLayoutItem;
typedef nasal::Ghost<sc::LayoutRef> NasalLayout; typedef nasal::Ghost<sc::LayoutRef> NasalLayout;
typedef nasal::Ghost<sc::BoxLayoutRef> NasalBoxLayout; typedef nasal::Ghost<sc::BoxLayoutRef> NasalBoxLayout;
typedef nasal::Ghost<sc::GridLayoutRef> NasalGridLayout; typedef nasal::Ghost<sc::GridLayoutRef> NasalGridLayout;
using NasalSpacerItem = nasal::Ghost<sc::SpacerItemRef>;
typedef nasal::Ghost<sc::WindowPtr> NasalWindow; typedef nasal::Ghost<sc::WindowPtr> NasalWindow;
@ -433,6 +435,16 @@ static naRef f_gridLayoutAddItem(sc::GridLayout& grid,
return naNil(); return naNil();
} }
static naRef f_newGridLayout(const nasal::CallContext& ctx)
{
return ctx.to_nasal(new sc::GridLayout);
}
static naRef f_newSpacerItem(const nasal::CallContext& ctx)
{
return ctx.to_nasal(new sc::SpacerItem);
}
naRef initNasalCanvas(naRef globals, naContext c) naRef initNasalCanvas(naRef globals, naContext c)
{ {
nasal::Hash globals_module(globals, c), nasal::Hash globals_module(globals, c),
@ -608,17 +620,23 @@ naRef initNasalCanvas(naRef globals, naContext c)
.method("setStretchFactor", &sc::BoxLayout::setStretchFactor) .method("setStretchFactor", &sc::BoxLayout::setStretchFactor)
.method("stretch", &sc::BoxLayout::stretch); .method("stretch", &sc::BoxLayout::stretch);
canvas_module.createHash("HBoxLayout")
.set("new", &f_newAsBase<sc::HBoxLayout, sc::BoxLayout>);
canvas_module.createHash("VBoxLayout")
.set("new", &f_newAsBase<sc::VBoxLayout, sc::BoxLayout>);
NasalGridLayout::init("canvas.GridLayout") NasalGridLayout::init("canvas.GridLayout")
.bases<NasalLayout>() .bases<NasalLayout>()
.method("addItem", &f_gridLayoutAddItem) .method("addItem", &f_gridLayoutAddItem)
.method("setRowStretch", &sc::GridLayout::setRowStretch) .method("setRowStretch", &sc::GridLayout::setRowStretch)
.method("setColumnStretch", &sc::GridLayout::setColumnStretch); .method("setColumnStretch", &sc::GridLayout::setColumnStretch);
NasalSpacerItem::init("canvas.SpacerItem")
.bases<NasalLayoutItem>();
canvas_module.createHash("HBoxLayout")
.set("new", &f_newAsBase<sc::HBoxLayout, sc::BoxLayout>);
canvas_module.createHash("VBoxLayout")
.set("new", &f_newAsBase<sc::VBoxLayout, sc::BoxLayout>);
canvas_module.createHash("GridLayout")
.set("new", &f_newGridLayout);
canvas_module.createHash("Spacer")
.set("new", &f_newSpacerItem);
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
// Window // Window