[fwbuilder-commits] r3012 - branches/v4_0/src/gui

[<a2...@in...>]

Author: a2k
Date: 2010-06-18 12:02:42 -0700 (Fri, 18 Jun 2010)
New Revision: 3012

Modified:
   branches/v4_0/src/gui/RuleSetView.cpp
   branches/v4_0/src/gui/RuleSetViewDelegate.cpp
Log:
Fixed #1520


Modified: branches/v4_0/src/gui/RuleSetView.cpp
===================================================================
--- branches/v4_0/src/gui/RuleSetView.cpp	2010-06-18 15:30:52 UTC (rev 3011)
+++ branches/v4_0/src/gui/RuleSetView.cpp	2010-06-18 19:02:42 UTC (rev 3012)
@@ -109,6 +109,7 @@
 
     this->setHorizontalScrollMode(QAbstractItemView::ScrollPerPixel);
     this->setVerticalScrollMode(QAbstractItemView::ScrollPerPixel);
+    this->header()->setStretchLastSection(false);
 }
 
 RuleSetView::~RuleSetView()

Modified: branches/v4_0/src/gui/RuleSetViewDelegate.cpp
===================================================================
--- branches/v4_0/src/gui/RuleSetViewDelegate.cpp	2010-06-18 15:30:52 UTC (rev 3011)
+++ branches/v4_0/src/gui/RuleSetViewDelegate.cpp	2010-06-18 19:02:42 UTC (rev 3012)
@@ -473,7 +473,6 @@
     }
 
     result = result.expandedTo(calculated);
-
     return result;
 }
 
@@ -481,10 +480,9 @@
 {
     QString text = index.data(Qt::DisplayRole).value<QString>();
     if (text.isNull() && text.isEmpty()) return QSize(0,0);
-
-    if (st->getClipComment()) return QSize(0,0);
-
     QSize res = getTextSize(text,0);
+    if (st->getClipComment())
+        res.setHeight(0);
     return res;
 }