Add a few types

Author: ogoffart

qmetaobject/src/qmetatype.rs

@@ -270,6 +270,9 @@ qdeclare_builtin_metatype! {QTime => 15}
 qdeclare_builtin_metatype! {QDateTime => 16}
 qdeclare_builtin_metatype! {QUrl => 17}
 qdeclare_builtin_metatype! {QRectF => 20}
+qdeclare_builtin_metatype! {QSize => 21}
+qdeclare_builtin_metatype! {QSizeF => 22}
+qdeclare_builtin_metatype! {QPoint => 25}
 qdeclare_builtin_metatype! {QPointF => 26}
 impl QMetaType for QVariant {
     fn register(_name: Option<&std::ffi::CStr>) -> i32 {
@@ -283,6 +286,7 @@ impl QMetaType for QVariant {
     }
 }
 qdeclare_builtin_metatype! {QModelIndex => 42}
+qdeclare_builtin_metatype! {QPixmap => 65}
 qdeclare_builtin_metatype! {QColor => 67}
 qdeclare_builtin_metatype! {QImage => 70}
 
@@ -438,3 +442,18 @@ fn test_qvariant_datetime() {
     assert!(qtime == QTime::from_h_m_s_ms(10, 30, Some(40), Some(100)));
     assert!(qtime != QTime::from_h_m_s_ms(10, 30, Some(40), None));
 }
+
+#[test]
+fn test_qvariant_qpoint_qrect() {
+    // test that conversion through a variant lead the the right data
+    assert_eq!(
+        QPoint::from_qvariant(QPointF { x: 23.1, y: 54.2 }.to_qvariant()),
+        Some(QPoint { x: 23, y: 54 })
+    );
+    let qrectf = QRectF { x: 4.1, y: 9.1, height: 7.3, width: 9.0 };
+    assert_eq!(QRectF::from_qvariant(qrectf.to_qvariant()), Some(qrectf));
+    assert_eq!(
+        QSize::from_qvariant(QSizeF { width: 123.1, height: 254.2 }.to_qvariant()),
+        Some(QSize { width: 123, height: 254 })
+    );
+}

qmetaobject/tests/tests.rs

@@ -961,3 +961,29 @@ fn component_status_changed() {
         assert_eq!(result.borrow().as_ref().unwrap().0, ComponentStatus::Loading);
     });
 }
+
+#[test]
+fn test_qvariant_qimage_qpixmap() {
+    let _lock = lock_for_test();
+    // QPixmap need a QApplication
+    let _app = QmlEngine::new();
+
+    let mut img = QImage::new(QSize { width: 12, height: 23 }, ImageFormat::ARGB32);
+    img.fill(QColor::from_name("red"));
+    img.set_pixel_color(2, 2, QColor::from_name("blue"));
+    let pix: QPixmap = img.clone().into();
+    assert_eq!(pix.size(), QSize { width: 12, height: 23 });
+    let img2 = QImage::from_qvariant(pix.clone().to_qvariant()).unwrap();
+    assert_eq!(img2.size(), QSize { width: 12, height: 23 });
+    dbg!(img2.get_pixel_color(3, 4).get_rgba());
+    assert!(img2.get_pixel_color(2, 2) == QColor::from_rgb_f(0., 0., 1.));
+    assert!(img2.get_pixel_color(3, 4) == QColor::from_rgb_f(1., 0., 0.));
+
+    let mut img3: QImage = pix.into();
+    assert!(img2 == img3);
+    assert_eq!(img3.size(), QSize { width: 12, height: 23 });
+    assert!(img3.get_pixel_color(2, 2) == QColor::from_rgb_f(0., 0., 1.));
+    assert!(img3.get_pixel_color(8, 4) == QColor::from_rgb_f(1., 0., 0.));
+    img3.set_pixel_color(8, 8, QColor::from_name("black"));
+    assert!(img2 != img3);
+}

qttypes/src/lib.rs

@@ -86,6 +86,7 @@ cpp! {{
     #include <QtCore/QUrl>
 
     #include <QtGui/QImage>
+    #include <QtGui/QPixmap>
 }}
 
 cpp_class!(
@@ -1006,10 +1007,19 @@ impl QRectF {
         })
     }
 
-    // XXX: shouldn't it be a wrapper for cpp call?
+    /// Same as the [`topLeft`][method] method.
+    ///
+    /// [method]: https://doc.qt.io/qt-5/qrectf.html#topLeft
     pub fn top_left(&self) -> QPointF {
         QPointF { x: self.x, y: self.y }
     }
+
+    /// Same as the [`isValid`][method] method.
+    ///
+    /// [method]: https://doc.qt.io/qt-5/qrectf.html#isValid
+    pub fn is_valid(&self) -> bool {
+        self.width > 0. && self.height > 0.
+    }
 }
 
 /// Bindings for [`QPointF`][class] class.
@@ -1039,6 +1049,16 @@ impl std::ops::AddAssign for QPointF {
     }
 }
 
+/// Bindings for [`QSizeF`][class] class.
+///
+/// [class]: https://doc.qt.io/qt-5/qsizef.html
+#[repr(C)]
+#[derive(Default, Clone, Copy, PartialEq, Debug)]
+pub struct QSizeF {
+    pub width: qreal,
+    pub height: qreal,
+}
+
 #[test]
 fn test_qpointf_qrectf() {
     let rect = QRectF { x: 200., y: 150., width: 60., height: 75. };
@@ -1136,6 +1156,28 @@ pub struct QSize {
     pub height: u32,
 }
 
+/// Bindings for [`QPoint`][class] class.
+///
+/// [class]: https://doc.qt.io/qt-5/qpoint.html
+#[repr(C)]
+#[derive(Default, Clone, Copy, PartialEq, Debug)]
+pub struct QPoint {
+    pub x: i32,
+    pub y: i32,
+}
+
+/// Bindings for [`QMargins`][class] class.
+///
+/// [class]: https://doc.qt.io/qt-5/qmargins.html
+#[repr(C)]
+#[derive(Default, Clone, Copy, PartialEq, Debug)]
+pub struct QMargins {
+    pub left: i32,
+    pub top: i32,
+    pub right: i32,
+    pub bottom: i32,
+}
+
 /// Bindings for [`QImage::Format`][class] enum class.
 ///
 /// [class]: https://doc.qt.io/qt-5/qimage.html#Format-enum
@@ -1178,6 +1220,7 @@ cpp_class!(
     /// Wrapper around [`QImage`][class] class.
     ///
     /// [class]: https://doc.qt.io/qt-5/qimage.html
+    #[derive(Default, Clone, PartialEq)]
     pub unsafe struct QImage as "QImage"
 );
 impl QImage {
@@ -1232,9 +1275,37 @@ impl QImage {
     /// Wrapper around [`pixelColor(const QPoint &)`][method] method.
     ///
     /// [method]: https://doc.qt.io/qt-5/qimage.html#pixelColor
-    pub fn get_pixel_color(&mut self, x: u32, y: u32) -> QColor {
-        cpp!(unsafe [self as "QImage*", x as "int", y as "int"] -> QColor as "QColor" {
+    pub fn get_pixel_color(&self, x: u32, y: u32) -> QColor {
+        cpp!(unsafe [self as "const QImage*", x as "int", y as "int"] -> QColor as "QColor" {
             return self->pixelColor(x, y);
         })
     }
 }
+
+cpp_class!(
+    /// Wrapper around [`QPixmap`][class] class.
+    ///
+    /// [class]: https://doc.qt.io/qt-5/qpixmap.html
+    pub unsafe struct QPixmap as "QPixmap"
+);
+
+impl QPixmap {
+    /// Wrapper around [`size()`][method] method.
+    ///
+    /// [method]: https://doc.qt.io/qt-5/qpixmap.html#size
+    pub fn size(&self) -> QSize {
+        cpp!(unsafe [self as "const QPixmap*"] -> QSize as "QSize" { return self->size(); })
+    }
+}
+
+impl From<QPixmap> for QImage {
+    fn from(pixmap: QPixmap) -> Self {
+        cpp!(unsafe [pixmap as "QPixmap"] -> QImage as "QImage" { return pixmap.toImage(); })
+    }
+}
+
+impl From<QImage> for QPixmap {
+    fn from(image: QImage) -> Self {
+        cpp!(unsafe [image as "QImage"] -> QPixmap as "QPixmap" { return QPixmap::fromImage(image); })
+    }
+}