Change UIElement::dragButtonCombo_ to be a MouseButtonFlags type

Also use the actual MOUSEB_ and QUAL_ constants instead of 0.

Source/Urho3D/UI/Button.cpp

@@ -149,8 +149,8 @@ void Button::OnKey(Key key, MouseButtonFlags buttons, QualifierFlags qualifiers)
     if (HasFocus() && (key == KEY_RETURN || key == KEY_RETURN2 || key == KEY_KP_ENTER || key == KEY_SPACE))
     {
         // Simulate LMB click
-        OnClickBegin(IntVector2(), IntVector2(), MOUSEB_LEFT, MouseButtonFlags(0), QualifierFlags(0), nullptr);
-        OnClickEnd(IntVector2(), IntVector2(), MOUSEB_LEFT, MouseButtonFlags(0), QualifierFlags(0), nullptr, nullptr);
+        OnClickBegin(IntVector2(), IntVector2(), MOUSEB_LEFT, MOUSEB_NONE, QUAL_NONE, nullptr);
+        OnClickEnd(IntVector2(), IntVector2(), MOUSEB_LEFT, MOUSEB_NONE, QUAL_NONE, nullptr, nullptr);
     }
 }
 

Source/Urho3D/UI/CheckBox.cpp

@@ -84,7 +84,7 @@ void CheckBox::OnKey(Key key, MouseButtonFlags buttons, QualifierFlags qualifier
     if (HasFocus() && key == KEY_SPACE)
     {
         // Simulate LMB click
-        OnClickBegin(IntVector2(), IntVector2(), MOUSEB_LEFT, MouseButtonFlags(0), QualifierFlags(0), nullptr);
+        OnClickBegin(IntVector2(), IntVector2(), MOUSEB_LEFT, MOUSEB_NONE, QUAL_NONE, nullptr);
     }
 }
 

Source/Urho3D/UI/ScrollBar.cpp

@@ -298,28 +298,28 @@ void ScrollBar::HandleSliderPaged(StringHash eventType, VariantMap& eventData)
 
     // Synthesize hover event to the forward/back buttons
     if (eventData[P_OFFSET].GetInt() < 0)
-        backButton_->OnHover(IntVector2::ZERO, backButton_->ElementToScreen(IntVector2::ZERO), MouseButtonFlags(0), QualifierFlags(0), nullptr);
+        backButton_->OnHover(IntVector2::ZERO, backButton_->ElementToScreen(IntVector2::ZERO), MOUSEB_NONE, QUAL_NONE, nullptr);
     else
-        forwardButton_->OnHover(IntVector2::ZERO, forwardButton_->ElementToScreen(IntVector2::ZERO), MouseButtonFlags(0), QualifierFlags(0), nullptr);
+        forwardButton_->OnHover(IntVector2::ZERO, forwardButton_->ElementToScreen(IntVector2::ZERO), MOUSEB_NONE, QUAL_NONE, nullptr);
 
     // Synthesize click / release events to the buttons
     if (eventData[P_PRESSED].GetBool())
     {
         if (eventData[P_OFFSET].GetInt() < 0)
             backButton_->OnClickBegin(IntVector2::ZERO, backButton_->ElementToScreen(IntVector2::ZERO),
-                MOUSEB_LEFT, MOUSEB_LEFT, QualifierFlags(0), nullptr);
+                MOUSEB_LEFT, MOUSEB_LEFT, QUAL_NONE, nullptr);
         else
             forwardButton_->OnClickBegin(IntVector2::ZERO, forwardButton_->ElementToScreen(IntVector2::ZERO),
-                MOUSEB_LEFT, MOUSEB_LEFT, QualifierFlags(0), nullptr);
+                MOUSEB_LEFT, MOUSEB_LEFT, QUAL_NONE, nullptr);
     }
     else
     {
         if (eventData[P_OFFSET].GetInt() < 0)
             backButton_->OnClickEnd(IntVector2::ZERO, backButton_->ElementToScreen(IntVector2::ZERO),
-                MOUSEB_LEFT, MouseButtonFlags(0), QualifierFlags(0), nullptr, backButton_);
+                MOUSEB_LEFT, MOUSEB_NONE, QUAL_NONE, nullptr, backButton_);
         else
             forwardButton_->OnClickEnd(IntVector2::ZERO, forwardButton_->ElementToScreen(IntVector2::ZERO),
-                MOUSEB_LEFT, MouseButtonFlags(0), QualifierFlags(0), nullptr, forwardButton_);
+                MOUSEB_LEFT, MOUSEB_NONE, QUAL_NONE, nullptr, forwardButton_);
     }
 }
 

Source/Urho3D/UI/ScrollView.cpp

@@ -130,7 +130,7 @@ void ScrollView::Update(float timeStep)
         for (unsigned i = 0; i < dragElements.Size(); i++)
         {
             UIElement* dragElement = dragElements[i];
-            int dragButtons = dragElement->GetDragButtonCombo();
+            MouseButtonFlags dragButtons = dragElement->GetDragButtonCombo();
 
             if (dragButtons != MOUSEB_LEFT)
                 continue;

Source/Urho3D/UI/UI.cpp

@@ -360,7 +360,7 @@ void UI::Update(float timeStep)
                     dragElement->OnDragBegin(dragElement->ScreenToElement(beginSendPos), beginSendPos, dragData->dragButtons,
                         qualifiers_, cursor_);
                 else
-                    dragElement->OnDragBegin(dragElement->ScreenToElement(beginSendPos), beginSendPos, dragData->dragButtons, QualifierFlags(0), nullptr);
+                    dragElement->OnDragBegin(dragElement->ScreenToElement(beginSendPos), beginSendPos, dragData->dragButtons, QUAL_NONE, nullptr);
 
                 SendDragOrHoverEvent(E_DRAGBEGIN, dragElement, beginSendPos, IntVector2::ZERO, dragData);
             }
@@ -1930,7 +1930,7 @@ void UI::HandleTouchEnd(StringHash eventType, VariantMap& eventData)
     }
 
     if (element && element->IsEnabled())
-        element->OnHover(element->ScreenToElement(pos), pos, MouseButtonFlags(0), QualifierFlags(0), nullptr);
+        element->OnHover(element->ScreenToElement(pos), pos, MOUSEB_NONE, QUAL_NONE, nullptr);
 
     ProcessClickEnd(pos, touchId, MOUSEB_NONE, QUAL_NONE, nullptr, true);
 }

Source/Urho3D/UI/UIElement.cpp

@@ -426,7 +426,7 @@ void UIElement::OnHover(const IntVector2& position, const IntVector2& screenPosi
 void UIElement::OnDragBegin(const IntVector2& position, const IntVector2& screenPosition, MouseButtonFlags buttons, QualifierFlags qualifiers,
     Cursor* cursor)
 {
-    dragButtonCombo_ = buttons.AsInteger();
+    dragButtonCombo_ = buttons;
     dragButtonCount_ = CountSetBits((unsigned)dragButtonCombo_);
 }
 
@@ -438,14 +438,14 @@ void UIElement::OnDragMove(const IntVector2& position, const IntVector2& screenP
 void UIElement::OnDragEnd(const IntVector2& position, const IntVector2& screenPosition, MouseButtonFlags /*dragButtons*/, MouseButtonFlags /*releaseButtons*/,
     Cursor* /*cursor*/)
 {
-    dragButtonCombo_ = 0;
+    dragButtonCombo_ = MOUSEB_NONE;
     dragButtonCount_ = 0;
 }
 
 void UIElement::OnDragCancel(const IntVector2& position, const IntVector2& screenPosition, MouseButtonFlags /*dragButtons*/, MouseButtonFlags /*cancelButtons*/,
     Cursor* /*cursor*/)
 {
-    dragButtonCombo_ = 0;
+    dragButtonCombo_ = MOUSEB_NONE;
     dragButtonCount_ = 0;
 }
 

Source/Urho3D/UI/UIElement.h

@@ -598,7 +598,7 @@ public:
     PODVector<UIElement*> GetChildrenWithTag(const String& tag, bool recursive = false) const;
 
     /// Return the drag button combo if this element is being dragged.
-    int GetDragButtonCombo() const { return dragButtonCombo_; }
+    MouseButtonFlags GetDragButtonCombo() const { return dragButtonCombo_; }
 
     /// Return the number of buttons dragging this element.
     unsigned GetDragButtonCount() const { return dragButtonCount_; }
@@ -740,7 +740,7 @@ protected:
     /// Applied style.
     String appliedStyle_;
     /// Drag button combo.
-    int dragButtonCombo_{};
+    MouseButtonFlags dragButtonCombo_{};
     /// Drag button count.
     unsigned dragButtonCount_{};