[yast-commit] r58355 - in /trunk/qt: VERSION.cmake package/yast2-qt.changes src/YQTable.cc src/YQTable.h

17 Aug 2009

Author: tgoettlicher
Date: Mon Aug 17 10:03:41 2009
New Revision: 58355

URL: http://svn.opensuse.org/viewcvs/yast?rev=58355&view=rev
Log:
Applied patch from Frank Schaefer that fixes resizing columns
in tables (bnc #392056)
V 2.18.8


Modified:
    trunk/qt/VERSION.cmake
    trunk/qt/package/yast2-qt.changes
    trunk/qt/src/YQTable.cc
    trunk/qt/src/YQTable.h

Modified: trunk/qt/VERSION.cmake
URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/VERSION.cmake?rev=58355&r1=58354&r2=58355&view=diff
==============================================================================

--- trunk/qt/VERSION.cmake (original)
+++ trunk/qt/VERSION.cmake Mon Aug 17 10:03:41 2009
@@ -1,3 +1,3 @@
 SET(VERSION_MAJOR "2")
 SET(VERSION_MINOR "18")
-SET(VERSION_PATCH "7")
+SET(VERSION_PATCH "8")

Modified: trunk/qt/package/yast2-qt.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/package/yast2-qt.changes?rev=58355&r1=58354&r2=58355&view=diff
==============================================================================
--- trunk/qt/package/yast2-qt.changes (original)
+++ trunk/qt/package/yast2-qt.changes Mon Aug 17 10:03:41 2009
@@ -1,4 +1,11 @@
 -------------------------------------------------------------------
+Mon Aug 17 10:01:34 CEST 2009 - tgoettlicher@suse.de
+
+- Applied patch from Frank Schaefer that fixes resizing columns
+  in tables (bnc #392056)
+- V 2.18.8
+
+-------------------------------------------------------------------
 Thu Jul 30 16:44:19 CEST 2009 - tgoettlicher@suse.de
 
 - Fixed translations in disk usage list (bnc #445716)

Modified: trunk/qt/src/YQTable.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQTable.cc?rev=58355&r1=58354&r2=58355&view=diff
==============================================================================
--- trunk/qt/src/YQTable.cc (original)
+++ trunk/qt/src/YQTable.cc Mon Aug 17 10:03:41 2009
@@ -71,7 +71,7 @@
     }
 
     _qt_listView->setHeaderLabels( headers );
-    _qt_listView->header()->setResizeMode( QHeaderView::ResizeToContents );
+    _qt_listView->header()->setResizeMode( QHeaderView::Interactive );
 
     
     //
@@ -118,12 +118,13 @@
 YQTable::addItem( YItem * yitem )
 {
     addItem( yitem,
-	     false ); // batchMode
+	     false, // batchMode
+	     true); // resizeColumnsToContent
 }
 
 
 void
-YQTable::addItem( YItem * yitem, bool batchMode )
+YQTable::addItem( YItem * yitem, bool batchMode, bool resizeColumnsToContent )
 {
     YTableItem * item = dynamic_cast (yitem);
     YUI_CHECK_PTR( item );
@@ -160,6 +161,13 @@
 
     if ( ! batchMode )
 	_qt_listView->sortItems( 0, Qt::AscendingOrder);
+    
+    if ( resizeColumnsToContent )
+    {
+        for ( int i=0; i < columns(); i++ )
+	    _qt_listView->resizeColumnToContents( i );
+	/* NOTE: resizeColumnToContents(...) is performance-critical ! */
+    }
 }
 
 
@@ -168,27 +176,24 @@
 {
     YQSignalBlocker sigBlocker( _qt_listView );
 
-    // Leaving our default ResizeToContents mode on means a massive performance
-    // drop when many (>50) are inserted (bnc #433130)
-    QHeaderView::ResizeMode oldResizeMode = _qt_listView->header()->resizeMode(0);
-    _qt_listView->header()->setResizeMode( QHeaderView::Fixed );
-
     for ( YItemConstIterator it = itemCollection.begin();
 	  it != itemCollection.end();
 	  ++it )
     {
 	addItem( *it,
-		 true ); // batchMode
+		 true,    // batchMode
+		 false ); // resizeColumnsToContent
+	/* NOTE: resizeToContents=true would cause a massive performance drop !
+	         => resize columns to content only one time at the end of this 
+	            function                                                 */
     }
 
-
     YItem * sel = YSelectionWidget::selectedItem();
 
     if ( sel )
 	YQTable::selectItem( sel, true );
     
     _qt_listView->sortItems( 0, Qt::AscendingOrder);
-    _qt_listView->header()->setResizeMode( oldResizeMode );
 
     for ( int i=0; i < columns(); i++ )
 	_qt_listView->resizeColumnToContents( i );

Modified: trunk/qt/src/YQTable.h
URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQTable.h?rev=58355&r1=58354&r2=58355&view=diff
==============================================================================
--- trunk/qt/src/YQTable.h (original)
+++ trunk/qt/src/YQTable.h Mon Aug 17 10:03:41 2009
@@ -173,7 +173,7 @@
      * Internal addItem() method that will not do expensive operations in batch
      * mode. 
      **/
-    void addItem( YItem * item, bool batchMode );
+    void addItem( YItem * item, bool batchMode, bool resizeColumnsToContent );
     
     //
     // Data members

-- 
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org

    

[yast-commit] r58355 - in /trunk/qt: VERSION.cmake package/yast2-qt.changes src/YQTable.cc src/YQTable.h

tgoettlicher＠svn.opensuse.org