Add activated to combobox and isNull to pixmap. Also improve mouse events

Author: kusti8

src/QtGui/qcombobox.cpp

@@ -10,6 +10,12 @@ void SlotHandlerComboBox::currentTextChangedSlot(const QString &text)
     element->currentTextChangedCallback_.Call({Napi::String::New(env, text.toStdString())});
 }
 
+void SlotHandlerComboBox::activatedSlot(const QString &text)
+{
+    Napi::Env env = element->activatedCallback_.Env();
+    element->activatedCallback_.Call({Napi::String::New(env, text.toStdString())});
+}
+
 Napi::Object QComboBoxWrap::Init(Napi::Env env, Napi::Object exports)
 {
     Napi::HandleScope scope(env);
@@ -25,6 +31,7 @@ Napi::Object QComboBoxWrap::Init(Napi::Env env, Napi::Object exports)
         InstanceMethod("isEditable", &QComboBoxWrap::isEditable),
         InstanceMethod("setEditable", &QComboBoxWrap::setEditable),
         InstanceMethod("currentTextChangedEvent", &QComboBoxWrap::currentTextChangedEvent),
+        InstanceMethod("activatedEvent", &QComboBoxWrap::activatedEvent),
         QWIDGET_JS_DEFINES(QComboBoxWrap)
     });
     // clang-format on
@@ -145,6 +152,17 @@ Napi::Value QComboBoxWrap::currentTextChangedEvent(const Napi::CallbackInfo &inf
     return Napi::Value();
 }
 
+Napi::Value QComboBoxWrap::activatedEvent(const Napi::CallbackInfo &info)
+{
+    Napi::Env env = info.Env();
+    Napi::HandleScope scope(env);
+
+    activatedCallback_ = Napi::Persistent(info[0].As<Napi::Function>());
+    QObject::connect(q_, SIGNAL(activated(const QString &)), &slotHandler, SLOT(activatedSlot(const QString &)));
+
+    return Napi::Value();
+}
+
 #include "qcombobox.moc"
 
 // QWidget functions

src/QtGui/qcombobox.hpp

@@ -23,6 +23,7 @@ class SlotHandlerComboBox : public QObject
 
 public slots:
   void currentTextChangedSlot(const QString &text);
+  void activatedSlot(const QString &text);
 };
 
 class QComboBoxWrap : public Napi::ObjectWrap<QComboBoxWrap>
@@ -35,6 +36,7 @@ class QComboBoxWrap : public Napi::ObjectWrap<QComboBoxWrap>
 
   QComboBoxImpl *q_;
   Napi::FunctionReference currentTextChangedCallback_;
+  Napi::FunctionReference activatedCallback_;
 
 private:
   static Napi::FunctionReference constructor;
@@ -49,6 +51,7 @@ class QComboBoxWrap : public Napi::ObjectWrap<QComboBoxWrap>
   Napi::Value isEditable(const Napi::CallbackInfo &info);
   Napi::Value setEditable(const Napi::CallbackInfo &info);
   Napi::Value currentTextChangedEvent(const Napi::CallbackInfo &info);
+  Napi::Value activatedEvent(const Napi::CallbackInfo &info);
 
   SlotHandlerComboBox slotHandler;
 

src/QtGui/qcombobox.moc

@@ -21,8 +21,8 @@ QT_BEGIN_MOC_NAMESPACE
 QT_WARNING_PUSH
 QT_WARNING_DISABLE_DEPRECATED
 struct qt_meta_stringdata_SlotHandlerComboBox_t {
-    QByteArrayData data[4];
-    char stringdata0[49];
+    QByteArrayData data[5];
+    char stringdata0[63];
 };
 #define QT_MOC_LITERAL(idx, ofs, len) \
     Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \
@@ -34,11 +34,12 @@ static const qt_meta_stringdata_SlotHandlerComboBox_t qt_meta_stringdata_SlotHan
 QT_MOC_LITERAL(0, 0, 19), // "SlotHandlerComboBox"
 QT_MOC_LITERAL(1, 20, 22), // "currentTextChangedSlot"
 QT_MOC_LITERAL(2, 43, 0), // ""
-QT_MOC_LITERAL(3, 44, 4) // "text"
+QT_MOC_LITERAL(3, 44, 4), // "text"
+QT_MOC_LITERAL(4, 49, 13) // "activatedSlot"
 
     },
     "SlotHandlerComboBox\0currentTextChangedSlot\0"
-    "\0text"
+    "\0text\0activatedSlot"
 };
 #undef QT_MOC_LITERAL
 
@@ -48,17 +49,19 @@ static const uint qt_meta_data_SlotHandlerComboBox[] = {
        7,       // revision
        0,       // classname
        0,    0, // classinfo
-       1,   14, // methods
+       2,   14, // methods
        0,    0, // properties
        0,    0, // enums/sets
        0,    0, // constructors
        0,       // flags
        0,       // signalCount
 
  // slots: name, argc, parameters, tag, flags
-       1,    1,   19,    2, 0x0a /* Public */,
+       1,    1,   24,    2, 0x0a /* Public */,
+       4,    1,   27,    2, 0x0a /* Public */,
 
  // slots: parameters
+    QMetaType::Void, QMetaType::QString,    3,
     QMetaType::Void, QMetaType::QString,    3,
 
        0        // eod
@@ -71,6 +74,7 @@ void SlotHandlerComboBox::qt_static_metacall(QObject *_o, QMetaObject::Call _c,
         Q_UNUSED(_t)
         switch (_id) {
         case 0: _t->currentTextChangedSlot((*reinterpret_cast< const QString(*)>(_a[1]))); break;
+        case 1: _t->activatedSlot((*reinterpret_cast< const QString(*)>(_a[1]))); break;
         default: ;
         }
     }
@@ -101,13 +105,13 @@ int SlotHandlerComboBox::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
     if (_id < 0)
         return _id;
     if (_c == QMetaObject::InvokeMetaMethod) {
-        if (_id < 1)
+        if (_id < 2)
             qt_static_metacall(this, _c, _id, _a);
-        _id -= 1;
+        _id -= 2;
     } else if (_c == QMetaObject::RegisterMethodArgumentMetaType) {
-        if (_id < 1)
+        if (_id < 2)
             *reinterpret_cast<int*>(_a[0]) = -1;
-        _id -= 1;
+        _id -= 2;
     }
     return _id;
 }

src/QtGui/qpixmap.cpp

@@ -14,7 +14,8 @@ Napi::Object QPixmapWrap::Init(Napi::Env env, Napi::Object exports)
         InstanceMethod("scaledToHeight", &QPixmapWrap::scaledToHeight),
         InstanceMethod("scaledTile", &QPixmapWrap::scaledTile),
         InstanceMethod("height", &QPixmapWrap::height),
-        InstanceMethod("width", &QPixmapWrap::width)
+        InstanceMethod("width", &QPixmapWrap::width),
+        InstanceMethod("isNull", &QPixmapWrap::isNull)
     });
     // clang-format on
 
@@ -134,4 +135,12 @@ Napi::Value QPixmapWrap::width(const Napi::CallbackInfo &info)
     Napi::HandleScope scope(env);
 
     return Napi::Number::New(env, q_->width());
+}
+
+Napi::Value QPixmapWrap::isNull(const Napi::CallbackInfo &info)
+{
+    Napi::Env env = info.Env();
+    Napi::HandleScope scope(env);
+
+    return Napi::Boolean::New(env, q_->isNull());
 }

src/QtGui/qpixmap.hpp

@@ -30,5 +30,6 @@ class QPixmapWrap : public Napi::ObjectWrap<QPixmapWrap>
   Napi::Value scaledTile(const Napi::CallbackInfo &info);
   Napi::Value height(const Napi::CallbackInfo &info);
   Napi::Value width(const Napi::CallbackInfo &info);
+  Napi::Value isNull(const Napi::CallbackInfo &info);
 };
 #endif

src/QtGui/qwidget_macros.hpp

@@ -121,15 +121,21 @@
     {                                                                                              \
         className::mousePressEvent(e);                                                             \
         if (mousePressCallback_.IsEmpty())                                                         \
+        {                                                                                          \
+            e->ignore();                                                                           \
             return;                                                                                \
+        }                                                                                          \
                                                                                                    \
         mousePressCallback_.Call({});                                                              \
     }                                                                                              \
     void className##Impl::mouseReleaseEvent(QMouseEvent *e)                                        \
     {                                                                                              \
         className::mouseReleaseEvent(e);                                                           \
         if (mouseReleaseCallback_.IsEmpty())                                                       \
+        {                                                                                          \
+            e->ignore();                                                                           \
             return;                                                                                \
+        }                                                                                          \
                                                                                                    \
         mouseReleaseCallback_.Call({});                                                            \
     }