fix WRectF united() issue

Author: Koen Deforche

Changelog

@@ -1,3 +1,7 @@
+12-10-2011:
+	* WRectF: fix isEmpty() to be more restrictive: only a rect with
+	width = 0 and height = 0 is now empty
+
 11-10-2011:
 	* WPopupMenuItem: fix crash with re-showing hidden popup
 

examples/simplechat/SimpleChatWidget.C

@@ -27,6 +27,7 @@ SimpleChatWidget::SimpleChatWidget(SimpleChatServer& server,
 				   Wt::WContainerWidget *parent)
   : WContainerWidget(parent),
     server_(server),
+    loggedIn_(false),
     userList_(0),
     messageReceived_(0)
 {
@@ -43,9 +44,8 @@ SimpleChatWidget::~SimpleChatWidget()
 
 void SimpleChatWidget::connect()
 {
-  if (server_.connect(this,
-		      boost::bind(&SimpleChatWidget::processChatEvent,
-				  this, _1)))
+  if (server_.connect
+      (this, boost::bind(&SimpleChatWidget::processChatEvent, this, _1)))
     Wt::WApplication::instance()->enableUpdates(true);
 }
 
@@ -97,6 +97,7 @@ void SimpleChatWidget::login()
 void SimpleChatWidget::logout()
 {
   if (loggedIn()) {
+    loggedIn_ = false;
     server_.logout(user_);
 
     letLogin();
@@ -164,7 +165,7 @@ void SimpleChatWidget::createLayout(WWidget *messages, WWidget *userList,
 
 bool SimpleChatWidget::loggedIn() const
 {
-  return !userNameEdit_;
+  return loggedIn_;
 }
 
 void SimpleChatWidget::render(WFlags<RenderFlag> flags)
@@ -189,6 +190,7 @@ bool SimpleChatWidget::startChat(const WString& user)
    * is used to indicate a new chat event for this user.
    */
   if (server_.login(user)) {
+    loggedIn_ = true;
     connect();
 
     user_ = user;    

examples/simplechat/SimpleChatWidget.h

@@ -83,6 +83,7 @@ class SimpleChatWidget : public Wt::WContainerWidget,
   UserMap users_;
 
   SimpleChatServer&     server_;
+  bool                  loggedIn_;
 
   Wt::JSlot             clearInput_;
 

src/Wt/WRectF

@@ -30,16 +30,15 @@ public:
    * 
    * \sa isNull()
    * \elseif java
-   * Constructs a rectangle from top left point (<i>x=0</i>, \p y=0)
-   * and size <i>width=0</i> x \p height=0.
+   * Constructs an empty rectangle at point (0, 0).
    * \endif
    */
   WRectF();
 
   /*! \brief Creates a rectangle.
    *
-   * Constructs a rectangle with top left point (<i>x</i>, \p y)
-   * and size <i>width</i> x \p height.
+   * Constructs a rectangle with top left point (\p x, \p y)
+   * and size \p width x \p height.
    */
   WRectF(double x, double y, double width, double height);
 
@@ -48,9 +47,9 @@ public:
    * Constructs a rectangle from the two points \p topLeft and
    * \p bottomRight.
    *
-   * If you want to create a rectangle from two arbitrary corner points,
-   * you can use this constructor too, but should call normalized()
-   * afterwords.
+   * If you want to create a rectangle from two arbitrary corner
+   * points, you can use this constructor too, but should call
+   * normalized() afterwords.
    */
   WRectF(const WPointF& topLeft, const WPointF& bottomRight);
 
@@ -73,8 +72,7 @@ public:
 
   /*! \brief Determines whether or not this rectangle is empty. 
    *
-   * A rectangle is empty if its width or its height is less than 
-   * or equal to zero.
+   * A rectangle is empty if its width and height are zero.
    */
   bool isEmpty() const;
 
@@ -94,27 +92,27 @@ public:
 
   /*! \brief Sets the width.
    *
-   * The right side of the rectangle may move, but does not change the X
-   * position of the left side.
+   * The right side of the rectangle may move, but this does not
+   * affect the left side.
    */
   void setWidth(double width) { width_ = width; }
 
   /*! \brief Sets the Y-position of the top side.
    *
-   * The bottom side of the rectangle may move, but does not change
-   * the Y position of the top side.
+   * The bottom side of the rectangle may move, but this does not
+   * affect the Y position of the top side.
    */
   void setHeight(double height) { height_ = height; }
 
-  /*! \brief Returns the X-position of the left side.
+  /*! \brief Returns the X-position (left side offset).
    *
    * This is equivalent to left().
    *
    * \sa y(), left()
    */
   double x() const { return x_; }
 
-  /*! \brief Returns the Y-position of the top side.
+  /*! \brief Returns the Y-position (top side offset).
    *
    * This is equivalent to top().
    *
@@ -134,25 +132,25 @@ public:
    */
   double height() const { return height_; }
 
-  /*! \brief Returns the X position of the left side.
+  /*! \brief Returns the X position (left side offset).
    *
    * \sa x(), right()
    */
   double left() const { return x_; }
 
-  /*! \brief Returns the Y position of the top side.
+  /*! \brief Returns the Y position (top side offset).
    *
    * \sa y(), bottom()
    */
   double top() const { return y_; }
 
-  /*! \brief Returns the X position of the right side.
+  /*! \brief Returns the the right side offset.
    *
    * \sa left()
    */
   double right() const { return x_ + width_; }
 
-  /*! \brief Returns the Y position of the bottom side.
+  /*! \brief Returns the bottom side offset.
    *
    * \sa top()
    */

src/Wt/WRectF.C

@@ -40,8 +40,11 @@ WRectF& WRectF::operator=(const WRectF& rhs)
 
 bool WRectF::operator==(const WRectF& rhs) const
 {
-  return (x_ == rhs.x_ && y_ == rhs.y_
-	  && width_ == rhs.width_ && height_ == rhs.height_);
+  return 
+       x_ == rhs.x_
+    && y_ == rhs.y_
+    && width_ == rhs.width_
+    && height_ == rhs.height_;
 }
 
 bool WRectF::operator!=(const WRectF& rhs) const
@@ -58,7 +61,7 @@ bool WRectF::isNull() const
 
 bool WRectF::isEmpty() const
 {
-  return width_ <= 0 || height_ <= 0;
+  return width_ == 0 && height_ == 0;
 }
 
 void WRectF::setX(double x)

src/web/skeleton/Wt.js

@@ -2208,8 +2208,8 @@ function load(fullapp) {
 
 var currentHideLoadingIndicator = null;
 
-function cancelFeedback(t) {
-  clearTimeout(t);
+function cancelFeedback(timer) {
+  clearTimeout(timer);
   document.body.style.cursor = 'auto';
 
   if (currentHideLoadingIndicator != null) {