kcms/decoration: Deduplicate event proxying code

src/kcms/decoration/declarative-plugin/previewitem.cpp

@@ -269,106 +269,70 @@ void PreviewItem::paintShadow(QPainter *painter, int &paddingLeft, int &paddingR
     }
 }
 
-void PreviewItem::mouseDoubleClickEvent(QMouseEvent *event)
+static QMouseEvent cloneEventWithPadding(QMouseEvent *event, int paddingLeft, int paddingTop)
 {
-    const auto &shadow = m_decoration->shadow();
+    return QMouseEvent(
-    if (shadow) {
+        event->type(),
-        QMouseEvent e(event->type(),
+        event->localPos() - QPointF(paddingLeft, paddingTop),
-                      event->localPos() - QPointF(shadow->paddingLeft(), shadow->paddingTop()),
         event->button(),
         event->buttons(),
         event->modifiers());
-        QCoreApplication::instance()->sendEvent(decoration(), &e);
-    } else {
-        QCoreApplication::instance()->sendEvent(decoration(), event);
 }
+
+static QHoverEvent cloneEventWithPadding(QHoverEvent *event, int paddingLeft, int paddingTop)
+{
+    return QHoverEvent(
+        event->type(),
+        event->posF() - QPointF(paddingLeft, paddingTop),
+        event->oldPosF() - QPointF(paddingLeft, paddingTop),
+        event->modifiers());
 }
 
-void PreviewItem::mousePressEvent(QMouseEvent *event)
+template <typename E>
+void PreviewItem::proxyPassEvent(E *event) const
 {
     const auto &shadow = m_decoration->shadow();
     if (shadow) {
-        QMouseEvent e(event->type(),
+        E e = cloneEventWithPadding(event, shadow->paddingLeft(), shadow->paddingTop());
-                      event->localPos() - QPointF(shadow->paddingLeft(), shadow->paddingTop()),
-                      event->button(),
-                      event->buttons(),
-                      event->modifiers());
         QCoreApplication::instance()->sendEvent(decoration(), &e);
     } else {
         QCoreApplication::instance()->sendEvent(decoration(), event);
     }
 }
 
-void PreviewItem::mouseReleaseEvent(QMouseEvent *event)
+void PreviewItem::mouseDoubleClickEvent(QMouseEvent *event)
 {
-    const auto &shadow = m_decoration->shadow();
+    proxyPassEvent(event);
-    if (shadow) {
-        QMouseEvent e(event->type(),
-                      event->localPos() - QPointF(shadow->paddingLeft(), shadow->paddingTop()),
-                      event->button(),
-                      event->buttons(),
-                      event->modifiers());
-        QCoreApplication::instance()->sendEvent(decoration(), &e);
-    } else {
-        QCoreApplication::instance()->sendEvent(decoration(), event);
 }
+
+void PreviewItem::mousePressEvent(QMouseEvent *event)
+{
+    proxyPassEvent(event);
 }
 
-void PreviewItem::mouseMoveEvent(QMouseEvent *event)
+void PreviewItem::mouseReleaseEvent(QMouseEvent *event)
 {
-    const auto &shadow = m_decoration->shadow();
+    proxyPassEvent(event);
-    if (shadow) {
-        QMouseEvent e(event->type(),
-                      event->localPos() - QPointF(shadow->paddingLeft(), shadow->paddingTop()),
-                      event->button(),
-                      event->buttons(),
-                      event->modifiers());
-        QCoreApplication::instance()->sendEvent(decoration(), &e);
-    } else {
-        QCoreApplication::instance()->sendEvent(decoration(), event);
 }
+
+void PreviewItem::mouseMoveEvent(QMouseEvent *event)
+{
+    proxyPassEvent(event);
 }
 
 void PreviewItem::hoverEnterEvent(QHoverEvent *event)
 {
-    const auto &shadow = m_decoration->shadow();
+    proxyPassEvent(event);
-    if (shadow) {
-        QHoverEvent e(event->type(),
-                      event->posF() - QPointF(shadow->paddingLeft(), shadow->paddingTop()),
-                      event->oldPosF() - QPointF(shadow->paddingLeft(), shadow->paddingTop()),
-                      event->modifiers());
-        QCoreApplication::instance()->sendEvent(decoration(), &e);
-    } else {
-        QCoreApplication::instance()->sendEvent(decoration(), event);
-    }
 }
 
 void PreviewItem::hoverLeaveEvent(QHoverEvent *event)
 {
-    const auto &shadow = m_decoration->shadow();
+    proxyPassEvent(event);
-    if (shadow) {
-        QHoverEvent e(event->type(),
-                      event->posF() - QPointF(shadow->paddingLeft(), shadow->paddingTop()),
-                      event->oldPosF() - QPointF(shadow->paddingLeft(), shadow->paddingTop()),
-                      event->modifiers());
-        QCoreApplication::instance()->sendEvent(decoration(), &e);
-    } else {
-        QCoreApplication::instance()->sendEvent(decoration(), event);
-    }
 }
 
 void PreviewItem::hoverMoveEvent(QHoverEvent *event)
 {
-    const auto &shadow = m_decoration->shadow();
+    proxyPassEvent(event);
-    if (shadow) {
-        QHoverEvent e(event->type(),
-                      event->posF() - QPointF(shadow->paddingLeft(), shadow->paddingTop()),
-                      event->oldPosF() - QPointF(shadow->paddingLeft(), shadow->paddingTop()),
-                      event->modifiers());
-        QCoreApplication::instance()->sendEvent(decoration(), &e);
-    } else {
-        QCoreApplication::instance()->sendEvent(decoration(), event);
-    }
 }
 
 bool PreviewItem::isDrawingBackground() const

src/kcms/decoration/declarative-plugin/previewitem.h

@@ -73,6 +73,8 @@ protected:
 
 private:
     void paintShadow(QPainter *painter, int &paddingLeft, int &paddingRight, int &paddingTop, int &paddingBottom);
+    template <typename E>
+    void proxyPassEvent(E *event) const;
     void syncSize();
     void createDecoration();
     Decoration *m_decoration;