see Changelog

Author: Koen Deforche

Changelog

@@ -1,3 +1,13 @@
+15-09-2008:
+	* WWidget: move WFormWidget::setEnabled() to WWidget::setDisabled(),
+	allowing all widgets to be set enabled or disabled.
+
+	* WWidget: isVisible() and isEnabled() reflect the computed visibility
+	respectively being enabled taking int account ancestors settings
+
+	* WWidget: added setHiddenKeepsGeometry(), which uses css visibility
+	for setHidden()
+
 03-09-2008:
 	* WDialog, Ext::Dialog, and related: allow for multiple modal dialogs
 	and nested exec() calls.

examples/widgetgallery/StyleLayout.C

@@ -23,6 +23,11 @@
 
 #include "EmwebLoadingIndicator.h"
 
+#ifdef WIN32
+#include <windows.h> // for Sleep()
+#else
+#include <unistd.h>
+#endif
 using namespace Wt;
 
 StyleLayout::StyleLayout(EventDisplayer *ed)
@@ -83,6 +88,14 @@ void StyleLayout::loadingIndicatorSelected(WString indicator)
   }
 }
 
+void StyleLayout::load(Wt::WMouseEvent) {
+#ifdef WIN32
+  Sleep(2000);
+#else
+  sleep(2);
+#endif
+}
+
 WWidget *StyleLayout::wBoxLayout()
 {
   WContainerWidget *result = new WContainerWidget();

examples/widgetgallery/StyleLayout.h

@@ -13,8 +13,6 @@
 #include <Wt/WString>
 #include <Wt/WEvent>
 
-#include <unistd.h>
-
 class StyleLayout : public ControlsWidget
 {
 public:
@@ -26,9 +24,7 @@ class StyleLayout : public ControlsWidget
   WWidget *css();
   WWidget *wLoadingIndicator();
   void loadingIndicatorSelected(Wt::WString indicator);
-  void load(Wt::WMouseEvent) {
-    sleep(2);
-  }
+  void load(Wt::WMouseEvent);
   WWidget *wBoxLayout();
   WWidget *wGridLayout();
   WWidget *wBorderLayout();

src/Wt/Http/Request

@@ -71,6 +71,7 @@ private:
     bool        isStolen;
 
     ~Impl();
+    void cleanup();
   };
 
   boost::shared_ptr<Impl> fileInfo_;

src/Wt/Http/Request.C

@@ -24,12 +24,17 @@ UploadedFile::UploadedFile(const std::string& spoolName,
   fileInfo_->isStolen = false;
 }
 
-UploadedFile::Impl::~Impl()
+void UploadedFile::Impl::cleanup()
 {
   if (!isStolen)
     unlink(spoolFileName.c_str());
 }
 
+UploadedFile::Impl::~Impl()
+{
+  cleanup();
+}
+
 const std::string& UploadedFile::spoolFileName() const
 {
   return fileInfo_->spoolFileName;

src/Wt/StdGridLayoutImpl.C

@@ -349,12 +349,6 @@ void StdGridLayoutImpl::setHint(const std::string& name,
        << "WGridLayout: unrecognized hint '" << name << "'";
 }
 
-int StdGridLayoutImpl::additionalVerticalPadding(bool fitWidth, bool fitHeight)
-  const
-{
-  return 0;
-}
-
 DomElement *StdGridLayoutImpl::createDomElement(bool fitWidth, bool fitHeight,
 						WApplication *app)
 {
@@ -502,9 +496,19 @@ DomElement *StdGridLayoutImpl::createDomElement(bool fitWidth, bool fitHeight,
 	  || (totalRowStretch == 0);
 
 	for (int i = 0; i < item.rowSpan_; ++i) {
+	  // FIXME: if we span multiple rows, it is not clear what we should
+	  // do ?
+	  //
+	  // if stretch == -1 or >0, then we should fit height
+	  // if stretch == 0, then we should not fit height if no row
+	  // stretch is set (in which case JavaScript will actively take
+	  // over anyway)
 	  if (grid_.rows_[row + i].stretch_)
 	    itemFitHeight = true;
+	  else if (!stretch)
+	    itemFitHeight = false;
 	  for (int j = 0; j < item.colSpan_; ++j) {
+	    // there is no special meaning for column stretches
 	    if (grid_.columns_[col + j].stretch_)
 	      itemFitWidth = true;
 	    if (i + j > 0)
@@ -518,9 +522,7 @@ DomElement *StdGridLayoutImpl::createDomElement(bool fitWidth, bool fitHeight,
 	// if we do, this makes the row no longer react to reductions
 	// in height... Which is worse? I think the former?
 	//
-	// Changed now: use stretch = -1 to force fitting height
-	//
-	// itemFitHeight = true;
+	// Solved now: use stretch = -1 to force fitting height
 
 	AlignmentFlag hAlign = item.alignment_ & AlignHorizontalMask;
 	AlignmentFlag vAlign = item.alignment_ & AlignVerticalMask;
@@ -563,13 +565,9 @@ DomElement *StdGridLayoutImpl::createDomElement(bool fitWidth, bool fitHeight,
 	if (!jsHeights)
 	  td->setAttribute("class", "Wt-grtd");
 
-	int additionalVerticalPadding = 0;
-
 	if (item.item_) {
 	  DomElement *c = getImpl(item.item_)
 	    ->createDomElement(itemFitWidth, itemFitHeight, app);
-	  additionalVerticalPadding = getImpl(item.item_)
-	    ->additionalVerticalPadding(itemFitWidth, itemFitHeight);
 
 	  if (hAlign == 0)
 	    hAlign = AlignJustify;
@@ -619,7 +617,7 @@ DomElement *StdGridLayoutImpl::createDomElement(bool fitWidth, bool fitHeight,
 
 	//style2 += "overflow:auto;";
 
-	int padding2 = padding[2] + additionalVerticalPadding;
+	int padding2 = padding[2];
 
 	if (padding[0] == padding[1] && padding[0] == padding2
 	    && padding[0] == padding[3]) {

src/Wt/StdGridLayoutImpl.h

@@ -28,7 +28,6 @@ class StdGridLayoutImpl : public StdLayoutImpl
 
   virtual DomElement *createDomElement(bool fitWidth, bool fitHeight,
 				       WApplication *app);
-  virtual int additionalVerticalPadding(bool fitWidth, bool fitHeight) const;
 
   static bool useJavaScriptHeights(WApplication *app);
 

src/Wt/StdLayoutItemImpl.h

@@ -34,8 +34,6 @@ class StdLayoutItemImpl : public WLayoutItemImpl, public WObject
   virtual void containerAddWidgets(WContainerWidget *container) = 0;
   virtual DomElement *createDomElement(bool fitWidth, bool fitHeight,
 				       WApplication *app) = 0;
-  virtual int additionalVerticalPadding(bool fitWidth, bool fitHeight)
-    const = 0;
 };
 
 }

src/Wt/StdWidgetItemImpl.C

@@ -38,12 +38,6 @@ void StdWidgetItemImpl::containerAddWidgets(WContainerWidget *container)
   container->addWidget(item_->widget());
 }
 
-int StdWidgetItemImpl::additionalVerticalPadding(bool fitWidth, bool fitHeight)
-  const
-{
-  return 0;
-}
-
 DomElement *StdWidgetItemImpl::createDomElement(bool fitWidth, bool fitHeight,
 						WApplication *app)
 {
@@ -95,10 +89,15 @@ DomElement *StdWidgetItemImpl::createDomElement(bool fitWidth, bool fitHeight,
 	|| d->type() == DomElement_TEXTAREA)
       d->setProperty(PropertyStyleHeight, "100%");
 
+  // on IE, a select is reduced to width 0 when setting width: 100% when nothing
+  // else in that column takes up space: that is a very bad thing...
   if (fitWidth && d->getProperty(PropertyStyleWidth).empty()) {
     if ((d->type() == DomElement_BUTTON
-	 || d->type() == DomElement_INPUT
-	 || d->type() == DomElement_SELECT
+	 || (d->type() == DomElement_INPUT
+	     && d->getAttribute("type") != "radio"
+	     && d->getAttribute("type") != "checkbox")
+	 || (d->type() == DomElement_SELECT
+	     && !app->environment().agentIsIE())
 	 || d->type() == DomElement_TEXTAREA))
       d->setProperty(PropertyStyleWidth, "100%");
   }

src/Wt/StdWidgetItemImpl.h

@@ -29,7 +29,6 @@ class StdWidgetItemImpl : public StdLayoutItemImpl
   virtual void containerAddWidgets(WContainerWidget *container);
   virtual DomElement *createDomElement(bool fitWidth, bool fitHeight,
 				       WApplication *app);
-  virtual int additionalVerticalPadding(bool fitWidth, bool fitHeight) const;
 
   virtual void setHint(const std::string& name, const std::string& value);