[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    qt-copy
From:       David Faure <faure () kde ! org>
Date:       2008-07-08 15:00:44
Message-ID: 1215529244.968575.12115.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 829466 by dfaure:

Fix from TT for the QMainWindow saveState/restoreState regression in Qt-4.4.0


 A             patches/0236-qtoolbararealayout-restore.diff  
 M  +1 -1      patches/README  
 M  +2 -1      src/gui/widgets/qtoolbararealayout.cpp  


--- trunk/qt-copy/patches/README #829465:829466
@@ -1,5 +1,5 @@
 Please assign the numbers incrementally, and don't reuse them. The next one:
-#0235
+#0237
 
 This directory contains patches for Qt that haven't been accepted by TrollTech
 yet. All patches in this directory itself shouldn't make qt-copy incompatible
--- trunk/qt-copy/src/gui/widgets/qtoolbararealayout.cpp #829465:829466
@@ -1323,7 +1323,8 @@
                 toolBar->setVisible(shown);
                 toolBar->d_func()->setWindowState(floating, true, rect);
 
-                item.extraSpace = item.size - pick(line.o, item.sizeHint());
+                //if it is -1, it means we should use the default size
+                item.extraSpace = (item.size == -1) ? 0 : item.size - pick(line.o, item.sizeHint());
 
 
                 line.toolBarItems.append(item);
[prev in list] [next in list] [prev in thread] [next in thread]