From dbc0337ba200f8e15755103a032113d4b0858e19 Mon Sep 17 00:00:00 2001 From: Artur Duque de Souza Date: Sat, 7 Nov 2009 11:46:58 +0000 Subject: [PATCH] Include last method (addCornerAnchors()) to js bindings THe last commit left out this very important function that is a convenience function. svn path=/trunk/KDE/kdebase/runtime/; revision=1046056 --- scriptengines/javascript/appletinterface.h | 8 ++++++++ scriptengines/javascript/qtgui/anchorlayout.cpp | 15 +++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/scriptengines/javascript/appletinterface.h b/scriptengines/javascript/appletinterface.h index ead99a27e..86ebc6fae 100644 --- a/scriptengines/javascript/appletinterface.h +++ b/scriptengines/javascript/appletinterface.h @@ -46,6 +46,7 @@ class AppletInterface : public QObject Q_ENUMS(AspectRatioMode) Q_ENUMS(QtOrientation) Q_ENUMS(QtAnchorPoint) + Q_ENUMS(QtCorner) Q_ENUMS(QtSizePolicy) Q_ENUMS(QtAlignment) Q_PROPERTY(QString activeConfig WRITE setActiveConfig READ activeConfig) @@ -113,6 +114,13 @@ enum QtAnchorPoint { QtAnchorVerticalCenter = Qt::AnchorVerticalCenter }; +enum QtCorner { + QtTopLeftCorner = Qt::TopLeftCorner, + QtTopRightCorner = Qt::TopRightCorner, + QtBottomLeftCorner = Qt::BottomLeftCorner, + QtBottomRightCorner = Qt::BottomRightCorner +}; + enum QtSizePolicy { QSizePolicyFixed = QSizePolicy::Fixed, QSizePolicyMinimum = QSizePolicy::Minimum, diff --git a/scriptengines/javascript/qtgui/anchorlayout.cpp b/scriptengines/javascript/qtgui/anchorlayout.cpp index f13a1fb7b..6ea40703e 100644 --- a/scriptengines/javascript/qtgui/anchorlayout.cpp +++ b/scriptengines/javascript/qtgui/anchorlayout.cpp @@ -106,6 +106,20 @@ BEGIN_DECLARE_METHOD(QGraphicsAnchorLayout, anchor) { return eng->newQObject(anchor, QScriptEngine::QtOwnership); } END_DECLARE_METHOD +BEGIN_DECLARE_METHOD(QGraphicsAnchorLayout, addCornerAnchors) { + QGraphicsLayoutItem *item1 = convertToLayoutItem(ctx, 0); + QGraphicsLayoutItem *item2 = convertToLayoutItem(ctx, 2); + + if (!item1 || !item2) { + return eng->undefinedValue(); + } + + self->addCornerAnchors(item1, static_cast(ctx->argument(1).toInt32()), + item2, static_cast(ctx->argument(3).toInt32())); + + return eng->undefinedValue(); +} END_DECLARE_METHOD + BEGIN_DECLARE_METHOD(QGraphicsAnchorLayout, addAnchors) { QGraphicsLayoutItem *item1 = convertToLayoutItem(ctx, 0); QGraphicsLayoutItem *item2 = convertToLayoutItem(ctx, 1); @@ -144,6 +158,7 @@ QScriptValue constructAnchorLayoutClass(QScriptEngine *eng) ADD_METHOD(proto, addAnchor); ADD_METHOD(proto, anchor); ADD_METHOD(proto, addAnchors); + ADD_METHOD(proto, addCornerAnchors); ADD_METHOD(proto, toString); QScript::registerPointerMetaType(eng, proto);