From a38a4a101ef3654807fb0a4e4f491b6c09f35bdc Mon Sep 17 00:00:00 2001
From: Uwe Rathmann <Uwe.Rathmann@tigertal.de>
Date: Mon, 28 Mar 2022 20:33:42 +0200
Subject: [PATCH] more State operators

---
 src/common/QskAspect.h | 46 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/src/common/QskAspect.h b/src/common/QskAspect.h
index 94e5bd42..fc3a94d7 100644
--- a/src/common/QskAspect.h
+++ b/src/common/QskAspect.h
@@ -109,8 +109,18 @@ class QSK_EXPORT QskAspect
     constexpr QskAspect operator|( Type ) const noexcept;
     constexpr QskAspect operator|( Primitive ) const noexcept;
     constexpr QskAspect operator|( Placement ) const noexcept;
+
     constexpr QskAspect operator|( State ) const noexcept;
+    QskAspect& operator|=( State ) noexcept;
+
+    constexpr QskAspect operator&( State ) const noexcept;
+    QskAspect& operator&=( State ) noexcept;
+
     constexpr QskAspect operator|( States ) const noexcept;
+    QskAspect& operator|=( States ) noexcept;
+
+    constexpr QskAspect operator&( States ) const noexcept;
+    QskAspect& operator&=( States ) noexcept;
 
     constexpr QskAspect stateless() const noexcept;
     constexpr QskAspect trunk() const noexcept;
@@ -283,12 +293,48 @@ inline constexpr QskAspect QskAspect::operator|( State state ) const noexcept
         m_bits.primitive, m_bits.placement, m_bits.states | state );
 }
 
+inline QskAspect& QskAspect::operator|=( State state ) noexcept
+{
+    m_bits.states |= state;
+    return *this;
+}
+
+inline constexpr QskAspect QskAspect::operator&( State state ) const noexcept
+{
+    return QskAspect( m_bits.subControl, m_bits.type, m_bits.isAnimator,
+        m_bits.primitive, m_bits.placement, m_bits.states & state );
+}
+
+inline QskAspect& QskAspect::operator&=( State state ) noexcept
+{
+    m_bits.states &= state;
+    return *this;
+}
+
 inline constexpr QskAspect QskAspect::operator|( States states ) const noexcept
 {
     return QskAspect( m_bits.subControl, m_bits.type, m_bits.isAnimator,
         m_bits.primitive, m_bits.placement, m_bits.states | states );
 }
 
+inline QskAspect& QskAspect::operator|=( States states ) noexcept
+{
+    m_bits.states |= states;
+    return *this;
+}
+
+inline constexpr QskAspect QskAspect::operator&( States states ) const noexcept
+{
+    return QskAspect( m_bits.subControl, m_bits.type, m_bits.isAnimator,
+        m_bits.primitive, m_bits.placement, m_bits.states & states );
+}
+
+inline QskAspect& QskAspect::operator&=( States states ) noexcept
+{
+    m_bits.states &= states;
+    return *this;
+}
+
 inline constexpr QskAspect QskAspect::stateless() const noexcept
 {
     return QskAspect( m_bits.subControl, m_bits.type, m_bits.isAnimator,