Removed Tabs, replaced FLT_MAX with large float. Capitalized event params

Source/Urho3D/UI/UI.cpp

@@ -95,7 +95,7 @@ UI::UI(Context* context) :
     dragBeginDistance_(DEFAULT_DRAGBEGIN_DISTANCE),
     mouseButtons_(0),
     lastMouseButtons_(0),
-	maxDoubleClickDist_(FLT_MAX),	
+    maxDoubleClickDist_(99999.0f),	
     qualifiers_(0),
     maxFontTextureSize_(DEFAULT_FONT_TEXTURE_MAX_SIZE),
     initialized_(false),
@@ -637,7 +637,7 @@ void UI::SetDoubleClickInterval(float interval)
 
 void UI::SetMaxDoubleClickDistance(float distPixels)
 {
-	maxDoubleClickDist_ = distPixels;
+    maxDoubleClickDist_ = distPixels;
 }
 
 void UI::SetDragBeginInterval(float interval)
@@ -1392,12 +1392,12 @@ void UI::ProcessClickBegin(const IntVector2& windowCursorPos, int button, int bu
             {
                 element->OnDoubleClick(element->ScreenToElement(cursorPos), cursorPos, button, buttons, qualifiers, cursor);
                 doubleClickElement_.Reset();
-				SendDoubleClickEvent(E_UIMOUSEDOUBLECLICK, nullptr, element, doubleClickFirstPos_, cursorPos, button, buttons, qualifiers);
+                SendDoubleClickEvent(E_UIMOUSEDOUBLECLICK, nullptr, element, doubleClickFirstPos_, cursorPos, button, buttons, qualifiers);
             }
             else
             {
                 doubleClickElement_ = element;
-				doubleClickFirstPos_ = windowCursorPos;
+                doubleClickFirstPos_ = windowCursorPos;
                 clickTimer_.Reset();
             }
 
@@ -1649,27 +1649,27 @@ void UI::SendClickEvent(StringHash eventType, UIElement* beginElement, UIElement
 }
 
 void UI::SendDoubleClickEvent(StringHash eventType, UIElement* beginElement, UIElement* endElement, const IntVector2& firstPos, const IntVector2& secondPos, int button,
-	int buttons, int qualifiers)
-{
-	VariantMap& eventData = GetEventDataMap();
-	eventData[UIMouseDoubleClick::P_ELEMENT] = endElement;
-	eventData[UIMouseDoubleClick::P_X] = secondPos.x_;
-	eventData[UIMouseDoubleClick::P_Y] = secondPos.y_;
-	eventData[UIMouseDoubleClick::P_XBegin] = firstPos.x_;
-	eventData[UIMouseDoubleClick::P_YBegin] = firstPos.y_;
-	eventData[UIMouseDoubleClick::P_BUTTON] = button;
-	eventData[UIMouseDoubleClick::P_BUTTONS] = buttons;
-	eventData[UIMouseDoubleClick::P_QUALIFIERS] = qualifiers;
-
-
-	if (endElement)
-	{
-		// Send also element version of the event
-		endElement->SendEvent(E_DOUBLECLICK, eventData);
-	}
-
-	// Send the global event from the UI subsystem last
-	SendEvent(eventType, eventData);
+    int buttons, int qualifiers)
+{
+    VariantMap& eventData = GetEventDataMap();
+    eventData[UIMouseDoubleClick::P_ELEMENT] = endElement;
+    eventData[UIMouseDoubleClick::P_X] = secondPos.x_;
+    eventData[UIMouseDoubleClick::P_Y] = secondPos.y_;
+    eventData[UIMouseDoubleClick::P_XBEGIN] = firstPos.x_;
+    eventData[UIMouseDoubleClick::P_YBEGIN] = firstPos.y_;
+    eventData[UIMouseDoubleClick::P_BUTTON] = button;
+    eventData[UIMouseDoubleClick::P_BUTTONS] = buttons;
+    eventData[UIMouseDoubleClick::P_QUALIFIERS] = qualifiers;
+
+
+    if (endElement)
+    {
+        // Send also element version of the event
+        endElement->SendEvent(E_DOUBLECLICK, eventData);
+    }
+
+    // Send the global event from the UI subsystem last
+    SendEvent(eventType, eventData);
 }
 
 

Source/Urho3D/UI/UI.h

@@ -92,7 +92,7 @@ public:
     void SetClipboardText(const String& text);
     /// Set UI element double click interval in seconds.
     void SetDoubleClickInterval(float interval);
-    /// Set max screen distance in pixels for double clicks to register.  default is FLT_MAX.
+    /// Set max screen distance in pixels for double clicks to register.  default is a very large distance as to have no effect.
     void SetMaxDoubleClickDistance(float pixels);
     /// Set UI drag event start interval in seconds.
     void SetDragBeginInterval(float interval);
@@ -165,11 +165,11 @@ public:
 
     /// Return UI element double click interval in seconds.
     float GetDoubleClickInterval() const { return doubleClickInterval_; }
-	
-	/// Get max screen distance for double clicks to register.  default is FLT_MAX.
+    
+    /// Get max screen distance for double clicks to register.  default is FLT_MAX.
     float GetMaxDoubleClickDistance() const { return maxDoubleClickDist_;}
     
-	/// Return UI drag start event interval in seconds.
+    /// Return UI drag start event interval in seconds.
     float GetDragBeginInterval() const { return dragBeginInterval_; }
 
     /// Return UI drag start event distance threshold in pixels.
@@ -299,10 +299,10 @@ private:
         (StringHash eventType, UIElement* beginElement, UIElement* endElement, const IntVector2& pos, int button, int buttons,
             int qualifiers);
 
-	/// Send a UI double click event
-	void SendDoubleClickEvent(StringHash eventType, UIElement* beginElement, UIElement* endElement, const IntVector2& firstPos, const IntVector2& secondPos, int button, int buttons, int qualifiers);
-	
-	/// Handle screen mode event.
+    /// Send a UI double click event
+    void SendDoubleClickEvent(StringHash eventType, UIElement* beginElement, UIElement* endElement, const IntVector2& firstPos, const IntVector2& secondPos, int button, int buttons, int qualifiers);
+    
+    /// Handle screen mode event.
     void HandleScreenMode(StringHash eventType, VariantMap& eventData);
     /// Handle mouse button down event.
     void HandleMouseButtonDown(StringHash eventType, VariantMap& eventData);
@@ -411,10 +411,10 @@ private:
     Timer clickTimer_;
     /// UI element last clicked for tracking double clicks.
     WeakPtr<UIElement> doubleClickElement_;
-	/// Screen position of first mouse click for double click distance checking.
-	IntVector2 doubleClickFirstPos_;
-	/// Max screen distance the first click in a double click can be from the second click in a double click.
-	float maxDoubleClickDist_;
+    /// Screen position of first mouse click for double click distance checking.
+    IntVector2 doubleClickFirstPos_;
+    /// Max screen distance the first click in a double click can be from the second click in a double click.
+    float maxDoubleClickDist_;
     /// Currently hovered elements.
     HashMap<WeakPtr<UIElement>, bool> hoveredElements_;
     /// Currently dragged elements.

Source/Urho3D/UI/UIEvents.h

@@ -56,8 +56,8 @@ URHO3D_EVENT(E_UIMOUSEDOUBLECLICK, UIMouseDoubleClick)
     URHO3D_PARAM(P_ELEMENT, Element);              // UIElement pointer
     URHO3D_PARAM(P_X, X);                          // int
     URHO3D_PARAM(P_Y, Y);                          // int
-	URHO3D_PARAM(P_XBegin, XBegin);                // int
-	URHO3D_PARAM(P_YBegin, YBegin);                // int
+    URHO3D_PARAM(P_XBEGIN, XBEGIN);                // int
+    URHO3D_PARAM(P_YBEGIN, YBEGIN);                // int
     URHO3D_PARAM(P_BUTTON, Button);                // int
     URHO3D_PARAM(P_BUTTONS, Buttons);              // int
     URHO3D_PARAM(P_QUALIFIERS, Qualifiers);        // int
@@ -89,14 +89,14 @@ URHO3D_EVENT(E_CLICKEND, ClickEnd)
 /// Mouse double click on a UI element. Parameters are same as in UIMouseDoubleClick event, but is sent by the element.
 URHO3D_EVENT(E_DOUBLECLICK, DoubleClick)
 {
-	URHO3D_PARAM(P_ELEMENT, Element);              // UIElement pointer
-	URHO3D_PARAM(P_X, X);                          // int
-	URHO3D_PARAM(P_Y, Y);                          // int
-	URHO3D_PARAM(P_XBegin, XBegin);                // int
-	URHO3D_PARAM(P_YBegin, YBegin);                // int
-	URHO3D_PARAM(P_BUTTON, Button);                // int
-	URHO3D_PARAM(P_BUTTONS, Buttons);              // int
-	URHO3D_PARAM(P_QUALIFIERS, Qualifiers);        // int
+    URHO3D_PARAM(P_ELEMENT, Element);              // UIElement pointer
+    URHO3D_PARAM(P_X, X);                          // int
+    URHO3D_PARAM(P_Y, Y);                          // int
+    URHO3D_PARAM(P_XBEGIN, XBEGIN);                // int
+    URHO3D_PARAM(P_YBEGIN, YBEGIN);                // int
+    URHO3D_PARAM(P_BUTTON, Button);                // int
+    URHO3D_PARAM(P_BUTTONS, Buttons);              // int
+    URHO3D_PARAM(P_QUALIFIERS, Qualifiers);        // int
 }
 
 /// Drag and drop test.