1. support for QScrollArea

2. rename and,or,xor to bitand,bitor,bitxor
jutyy · Aug 10, 2013 · 9a1cd30 · 9a1cd30
1 parent ff2cde1
commit 9a1cd30
Show file tree

Hide file tree

Showing 4 changed files with 75 additions and 3 deletions.
diff --git a/flexview/src/lua_util.cpp b/flexview/src/lua_util.cpp
@@ -172,9 +172,9 @@ LQUtil lqutil()
         def("toBase64", toBase64),
         def("fromBase64", fromBase64),
         def("fromString", fromString),
-        def("and", my_and),
-        def("or", my_or),
-        def("xor", my_xor),
+        def("bitand", my_and),
+        def("bitor", my_or),
+        def("bitxor", my_xor),
 
         def("toUint32", toT<uint32_t>),
         def("toUint16", toT<uint16_t>),

diff --git a/flexview/src/qtwrapper/lua_qmainwindow.cpp b/flexview/src/qtwrapper/lua_qmainwindow.cpp
@@ -248,6 +248,75 @@ LQAbstractScrollArea lqabstractscrollarea()
     ;
 }
 
+static setter_map<QScrollArea> lqscrollarea_set_map;
+QScrollArea* lqscrollarea_init(QScrollArea* widget, const object& obj)
+{
+    lqwidget_init(widget,obj);
+    lq_general_init(widget, obj, lqscrollarea_set_map);
+    return widget;
+}
+
+template<>
+void table_init_general<QScrollArea>(const luabind::argument & arg, const object& obj)
+{
+    lqscrollarea_init(construct<QScrollArea>(arg), obj);
+}
+
+void QScrollArea_ensureVisible1(QScrollArea* widget, int x, int y)
+{
+    widget->ensureVisible(x,y);
+}
+void QScrollArea_ensureVisible2(QScrollArea* widget, int x, int y, int xmargin)
+{
+    widget->ensureVisible(x,y,xmargin);
+}
+void QScrollArea_ensureVisible3(QScrollArea* widget, int x, int y, int xmargin, int ymargin)
+{
+    widget->ensureVisible(x,y,xmargin,ymargin);
+}
+
+void QScrollArea_ensureWidgetVisible1(QScrollArea* widget, QWidget * childWidget)
+{
+    widget->ensureWidgetVisible(childWidget);
+}
+void QScrollArea_ensureWidgetVisible2(QScrollArea* widget, QWidget * childWidget, int xmargin)
+{
+    widget->ensureWidgetVisible(childWidget,xmargin);
+}
+void QScrollArea_ensureWidgetVisible3(QScrollArea* widget, QWidget * childWidget, int xmargin, int ymargin)
+{
+    widget->ensureWidgetVisible(childWidget,xmargin,ymargin);
+}
+
+ENUM_FILTER(QScrollArea,alignment,setAlignment)
+LQScrollArea lqscrollarea()
+{
+    return
+    myclass_<QScrollArea,QAbstractScrollArea>("QScrollArea", lqscrollarea_set_map)
+    .def(constructor<>())
+    .def(constructor<QWidget*>())
+    .def("__call", lqscrollarea_init)
+    .def("__init", table_init_general<QScrollArea>)
+
+    .def("ensureVisible", QScrollArea_ensureVisible1)
+    .def("ensureVisible", QScrollArea_ensureVisible2)
+    .def("ensureVisible", QScrollArea_ensureVisible3)
+    .def("ensureVisible", QScrollArea_ensureWidgetVisible1)
+    .def("ensureVisible", QScrollArea_ensureWidgetVisible2)
+    .def("ensureVisible", QScrollArea_ensureWidgetVisible3)
+
+    .def("ensureWidgetVisible", QScrollArea_ensureWidgetVisible1)
+    .def("ensureWidgetVisible", QScrollArea_ensureWidgetVisible2)
+    .def("ensureWidgetVisible", QScrollArea_ensureWidgetVisible3)
+    .def("takeWidget", &QScrollArea::takeWidget)
+
+    .property("alignment", QScrollArea_alignment, QScrollArea_setAlignment)
+    .property("widgetResizable", &QScrollArea::widgetResizable, &QScrollArea::setWidgetResizable)
+
+    .class_<QScrollArea,QAbstractScrollArea>::property("widget", &QScrollArea::widget, &QScrollArea::setWidget)
+    ;
+}
+
 SIGNAL_PROPERYT(lqmdiarea, subWindowActivated, QMdiArea, "(QMdiSubWindow*)")
 LQMdiArea lqmdiarea()
 {

diff --git a/flexview/src/qtwrapper/lua_qmainwindow.h b/flexview/src/qtwrapper/lua_qmainwindow.h
@@ -9,6 +9,7 @@ typedef class_<QMainWindow,QWidget>         LQMainWindow;
 typedef class_<QDockWidget,QWidget>         LQDockWidget;
 typedef class_<QStatusBar,QWidget>          LQStatusBar;
 typedef class_<QAbstractScrollArea,QFrame> LQAbstractScrollArea;
+typedef class_<QScrollArea,QAbstractScrollArea> LQScrollArea;
 typedef class_<QMdiArea,QAbstractScrollArea> LQMdiArea;
 typedef class_<QMdiSubWindow,QWidget> LQMdiSubWindow;
 typedef class_<QSystemTrayIcon,QObject> LQSystemTrayIcon;
@@ -17,6 +18,7 @@ LQMainWindow lqmainwindow();
 LQDockWidget lqdockwidget();
 LQStatusBar lqstatusbar();
 LQAbstractScrollArea lqabstractscrollarea();
+LQScrollArea lqscrollarea();
 LQMdiArea lqmdiarea();
 LQMdiSubWindow lqmdisubwindow();
 LQSystemTrayIcon lqsystemtrayicon();

diff --git a/flexview/src/qtwrapper/regclass.cpp b/flexview/src/qtwrapper/regclass.cpp
@@ -278,6 +278,7 @@ void register_classes(lua_State* L, char const* name = 0)
         lqsplitter(),
 
         lqabstractscrollarea(),
+        lqscrollarea(),
         lqmdisubwindow(),
         lqmdiarea(),
         lqsystemtrayicon(),