reimplemented WAbstractItemView header item rendering, and various RTL layout issues

Author: Koen Deforche

Changelog

@@ -1,3 +1,8 @@
+19-10-2011:
+	* WAbstractItemView: reimplemented and simplified header item rendering
+
+	* Wt.js: workaround browser bugs in scrollLeft reading in RTL mode,		fixing WAbstractItemView column resizing in RTL layouts.
+	
 12-10-2011:
 	* WRectF: fix isEmpty() to be more restrictive: only a rect with
 	width = 0 and height = 0 is now empty

cmake/WtFindPangoFt2.txt

@@ -1,10 +1,3 @@
-# We set:
-# - PANGO_FT2_INCLUDE_DIRS
-# - PANGO_FT2_LIBRARIES
-# - PANGO_FT2_FOUND
-# Taking into account:
-# - PANGO_FT2_PREFIX
-
 FIND_PACKAGE(PkgConfig)
 
 PKG_CHECK_MODULES(PC_PANGO_FT2 pangoft2)

examples/dialog/DialogExample.C

@@ -143,7 +143,7 @@ void DialogExample::messageBoxDone(StandardButton result)
 void DialogExample::custom()
 {
   WDialog dialog("Personalia");
-  dialog.showCloseIcon();
+  dialog.setClosable(true);
 
   new WText("Enter your name: ", dialog.contents());
   WLineEdit edit(dialog.contents());

examples/treeview/TreeViewExample.C

@@ -45,6 +45,7 @@ TreeViewExample::TreeViewExample(WStandardItemModel *model,
   panel->setCentralWidget(treeView_ = new WTreeView());
   if (!WApplication::instance()->environment().ajax())
     treeView_->resize(WLength::Auto, 290);
+
   treeView_->setAlternatingRowColors(true);
   treeView_->setRowHeight(25);
   treeView_->setModel(model_);

resources/themes/default/wt.css

@@ -607,11 +607,16 @@ body.Wt-rtl .Wt-tabs span {
     float: right;
     width: 4px;
     cursor: col-resize;
-    padding-left: 0px;
 }
 
 body.Wt-rtl .Wt-itemview div.Wt-tv-rh {
-    float: left; padding-right: 0px;
+    float: left;
+}
+
+.Wt-itemview div.Wt-tv-no-rh {
+    width: 0px;
+    margin-left: 4px;
+    cursor: default;
 }
 
 /* sort handles */
@@ -702,6 +707,8 @@ body.Wt-rtl .Wt-tableview .Wt-header .Wt-tv-c {
 .Wt-tableview .Wt-tv-contents .Wt-tv-c,
 .Wt-plaintable .Wt-tv-c {
     padding: 0px 3px;
+    overflow: hidden;
+    text-overflow: ellipsis;
 }
 
 .Wt-tableview .Wt-tv-contents img.icon,

resources/themes/polished/wt.css

@@ -557,9 +557,14 @@
     height: 16px;
 }
 
+body.Wt-rtl .Wt-tabs .item, body.Wt-rtl .Wt-tabs .itemselected,
+body.Wt-rtl .Wt-tabs .citem, body.Wt-rtl .Wt-tabs .citemselected {
+    float: right;
+}
+
 .Wt-tabs li a, .Wt-tabs li button {
-   text-decoration: none;
-   color: inherit;
+    text-decoration: none;
+    color: inherit;
 }
 
 .Wt-tabs li button a {
@@ -702,11 +707,16 @@
     float: right;
     width: 4px;
     cursor: col-resize;
-    padding-left: 0px;
 }
 
 body.Wt-rtl .Wt-itemview div.Wt-tv-rh {
-    float: left; padding-right: 0px;
+    float: left;
+}
+
+.Wt-itemview div.Wt-tv-no-rh {
+    width: 0px;
+    margin-left: 4px;
+    cursor: default;
 }
 
 /* sort handles */
@@ -801,6 +811,8 @@ body.Wt-rtl .Wt-tableview .Wt-header .Wt-tv-c {
 .Wt-tableview .Wt-tv-contents .Wt-tv-c,
 .Wt-plaintable .Wt-tv-c {
     padding: 0px 3px;
+    overflow: hidden;
+    text-overflow: ellipsis;
 }
 
 .Wt-tableview .Wt-tv-contents img.icon,

src/CMakeLists.txt

@@ -315,6 +315,11 @@ IF(HAVE_PANGO)
   INCLUDE_DIRECTORIES(${PANGO_FT2_INCLUDE_DIRS})
   ADD_DEFINITIONS(-DHAVE_PANGO)
   MESSAGE("** Enabling advanced font support using libpango")
+ELSE(HAVE_PANGO)
+  MESSAGE("** Disabling advanced font rendering support: requires libpango.")
+  IF(ENABLE_PANGO)
+    MESSAGE("   Wt will use pkg-config to retrieve your libpango installation location.")
+  ENDIF(ENABLE_PANGO)
 ENDIF(HAVE_PANGO)
 
 IF(MULTI_THREADED_BUILD)

src/Wt/Chart/WAxis.C

@@ -810,7 +810,7 @@ void WAxis::getLabelTicks(WChart2DRenderer& renderer,
 
     double days = daysRange / numLabels;
 
-    enum { Days, Months, Years, Hours, Minutes } unit;
+    enum { Minutes, Hours, Days, Months, Years } unit;
     int interval;
 
     if (days > 200) {

src/Wt/WAbstractItemView

@@ -882,6 +882,7 @@ protected:
 
   virtual ColumnInfo createColumnInfo(int column) const;
 
+  void saveExtraHeaderWidgets();
   WWidget *createHeaderWidget(WApplication *app, int column);
   WText *headerTextWidget(int column);
 

src/Wt/WAbstractItemView.C

@@ -946,40 +946,43 @@ int WAbstractItemView::headerLevel(int column) const
     (asNumber(model_->headerData(column, Horizontal, LevelRole)));
 }
 
-WWidget *WAbstractItemView::createHeaderWidget(WApplication *app, int column)
+void WAbstractItemView::saveExtraHeaderWidgets()
 {
-  static const char *OneLine = "<div>&nbsp;</div>";
+  for (int i = 0; i < columnCount(); ++i) {
+    WWidget *w = columnInfo(i).extraHeaderWidget;
+    if (w && w->parent())
+      dynamic_cast<WContainerWidget *>(w->parent())->removeWidget(w);
+  }
+}
 
-  int headerLevel = model_ ? this->headerLevel(column) : 0;
+WWidget *WAbstractItemView::createHeaderWidget(WApplication *app, int column)
+{
+  /****
+   * result:
+   * +------------------------------+
+   * | +----------------------+     +
+   * | | +------------------+ |     |
+   * | | | contents         | |     |
+   * | | +------------------+ | +-+ |
+   * | | +------------------+ | | | |
+   * | | | extra widget     | | | <------ resize handle with border right and
+   * | | | ....             | | | | |     margin-top for right-border-level
+   * | | +------------------+ | | | |
+   * | +----------------------+ +-+ |
+   * +------------------------------+    
+   */
 
-  int rightBorderLevel = headerLevel;
-  if (model_) {
-    int rightColumn = modelColumnIndex(visibleColumnIndex(column) + 1);
-    if (rightColumn != -1) {
-      WFlags<HeaderFlag> flagsLeft = model_->headerFlags(column);
-      WFlags<HeaderFlag> flagsRight = model_->headerFlags(rightColumn);
-      
-      int rightHeaderLevel = this->headerLevel(rightColumn);
+  ColumnInfo& info = columnInfo(column);
 
-      if (flagsLeft & ColumnIsExpandedRight)
-	rightBorderLevel = headerLevel + 1;
-      else if (flagsRight & ColumnIsExpandedLeft)
-	rightBorderLevel = rightHeaderLevel + 1;
-      else
-	rightBorderLevel = std::min(headerLevel, rightHeaderLevel);
-    }
-  }
+  /* Contents */
 
-  ColumnInfo& info = columnInfo(column);
-  WContainerWidget *w = new WContainerWidget();
-  w->setObjectName("contents");
+  WContainerWidget *contents = new WContainerWidget();
+  contents->setObjectName("contents");
 
   if (info.sorting) {
-    WText *sortIcon = new WText(w);
+    WText *sortIcon = new WText(contents);
     sortIcon->setObjectName("sort");
     sortIcon->setInline(false);
-    if (!columnResize_)
-      sortIcon->setMargin(4, Right);
     sortIcon->setStyleClass("Wt-tv-sh Wt-tv-sh-none");
     clickedForSortMapper_->mapConnect(sortIcon->clicked(), info.id);
 
@@ -991,13 +994,13 @@ WWidget *WAbstractItemView::createHeaderWidget(WApplication *app, int column)
 
   if (model_->headerFlags(column)
       & (ColumnIsExpandedLeft | ColumnIsExpandedRight)) {
-    WImage *collapseIcon = new WImage(w);
+    WImage *collapseIcon = new WImage(contents);
     collapseIcon->setFloatSide(Left);
     collapseIcon
       ->setImageLink(WLink(WApplication::resourcesUrl() + "minus.gif"));
     clickedForCollapseMapper_->mapConnect(collapseIcon->clicked(), info.id);
   } else if (model_->headerFlags(column) & ColumnIsCollapsed) {
-    WImage *expandIcon = new WImage(w);
+    WImage *expandIcon = new WImage(contents);
     expandIcon->setFloatSide(Left);
     expandIcon
       ->setImageLink(WLink(WApplication::resourcesUrl() + "plus.gif"));
@@ -1008,18 +1011,7 @@ WWidget *WAbstractItemView::createHeaderWidget(WApplication *app, int column)
 					   0);
   i->setInline(false);
   i->addStyleClass("Wt-label");
-  w->addWidget(i);
-
-  /*
-  WText *t = new WText("&nbsp;", w);
-  t->setObjectName("text");
-  t->setStyleClass("Wt-label");
-  t->setInline(false);
-  if (multiLineHeader_ || app->environment().agentIsIE())
-    t->setWordWrap(true);
-  else
-    t->setWordWrap(false);
-  */
+  contents->addWidget(i);
 
   // FIXME: we probably want this as an API option ?
   if (info.sorting) {
@@ -1028,68 +1020,75 @@ WWidget *WAbstractItemView::createHeaderWidget(WApplication *app, int column)
       clickedForSortMapper_->mapConnect(ww->clicked(), info.id);
   }
 
-  WContainerWidget *result = new WContainerWidget();
+  int headerLevel = model_ ? this->headerLevel(column) : 0;
 
-  if (headerLevel) {
-    WContainerWidget *spacer = new WContainerWidget(result);
-    WText *t = new WText(spacer);
-    t->setInline(false);
-
-    if (rightBorderLevel < headerLevel) {
-      if (rightBorderLevel) {
-	t->setText(repeat(OneLine, rightBorderLevel));
-	spacer = new WContainerWidget(result);
-	t = new WText(spacer);
-	t->setInline(false);
-      }
-      t->setText(repeat(OneLine, headerLevel - rightBorderLevel));
-      spacer->setStyleClass("Wt-tv-br");
-    } else {
-      t->setText(repeat(OneLine, headerLevel));
+  contents->setMargin(headerLevel * headerLineHeight_.toPixels(), Top);
+
+  /* Resize handle (or border-right 1 stub) */
+
+  int rightBorderLevel = headerLevel;
+  if (model_) {
+    int rightColumn = modelColumnIndex(visibleColumnIndex(column) + 1);
+    if (rightColumn != -1) {
+      WFlags<HeaderFlag> flagsLeft = model_->headerFlags(column);
+      WFlags<HeaderFlag> flagsRight = model_->headerFlags(rightColumn);
+      
+      int rightHeaderLevel = this->headerLevel(rightColumn);
+
+      if (flagsLeft & ColumnIsExpandedRight)
+	rightBorderLevel = headerLevel + 1;
+      else if (flagsRight & ColumnIsExpandedLeft)
+	rightBorderLevel = rightHeaderLevel + 1;
+      else
+	rightBorderLevel = std::min(headerLevel, rightHeaderLevel);
     }
   }
 
-  if (rightBorderLevel <= headerLevel)
-    w->addStyleClass("Wt-tv-br");
+  bool activeRH = columnResize_;
 
-  result->addWidget(w);
-  result->setStyleClass(info.styleClass() + " Wt-tv-c headerrh");
-  result->setContentAlignment(info.headerHAlignment);
+  WContainerWidget *resizeHandle = new WContainerWidget();
+  resizeHandle->setStyleClass(std::string("Wt-tv-rh")
+			      + (activeRH ? "" : " Wt-tv-no-rh" )
+			      + " Wt-tv-br headerrh");
 
-  if (info.headerVAlignment == AlignMiddle)
-    result->setLineHeight(headerLineHeight_);
-  else {
-    result->setLineHeight(WLength::Auto);
-    if (info.headerWordWrap)
-      result->addStyleClass("Wt-wwrap");
-  }
+  if (activeRH)
+    resizeHandle->mouseWentDown().connect(resizeHandleMDownJS_);
+
+  resizeHandle->setMargin(rightBorderLevel * headerLineHeight_.toPixels(), Top);
+
+  /*
+   * Extra widget
+   */
+
+  if (!columnInfo(column).extraHeaderWidget)
+    columnInfo(column).extraHeaderWidget = createExtraHeaderWidget(column);
 
   WWidget *extraW = columnInfo(column).extraHeaderWidget;
-  if (extraW) {
-    result->addWidget(extraW);
-    extraW->addStyleClass("Wt-tv-br");
-  }
 
-  if (columnResize_ && app->environment().ajax()) {
-    WContainerWidget *resizeHandle = new WContainerWidget();
-    resizeHandle->setStyleClass("Wt-tv-rh headerrh");
-    resizeHandle->mouseWentDown().connect(resizeHandleMDownJS_);
+  /*
+   * Assemble into result
+   */
+  WContainerWidget *result = new WContainerWidget();
+  result->setStyleClass(info.styleClass() + " Wt-tv-c headerrh");
+  result->addWidget(resizeHandle);
 
-    bool ie = wApp->environment().agentIsIE();
-    WContainerWidget *parent
-      = ie ? w : dynamic_cast<WContainerWidget *>(result->widget(0));
-    parent->insertWidget(0, resizeHandle);
+  WContainerWidget *main = new WContainerWidget();
+  main->setOverflow(WContainerWidget::OverflowHidden);
+  main->setContentAlignment(info.headerHAlignment);
+  result->addWidget(main);
 
-    if (ie) {
-      parent->setAttributeValue("style", "zoom: 1");
-      parent->resize(WLength::Auto, headerLineHeight_);
-    }
+  main->addWidget(contents);
+
+  if (info.headerVAlignment == AlignMiddle)
+    main->setLineHeight(headerLineHeight_);
+  else {
+    main->setLineHeight(WLength::Auto);
+    if (info.headerWordWrap)
+      main->addStyleClass("Wt-wwrap");
   }
 
-  WText *spacer = new WText();
-  spacer->setInline(false);
-  spacer->setStyleClass("Wt-tv-br headerrh");
-  result->addWidget(spacer);
+  if (extraW)
+    main->addWidget(extraW);
 
   return result;
 }