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

List:       kde-commits
Subject:    branches/work/kde4/kdegraphics/kpdf
From:       Albert Astals Cid <tsdgeos () terra ! es>
Date:       2005-05-31 23:14:17
Message-ID: 1117581257.413633.11261.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 420392 by aacid:

fix layouting a bit


 M  +2 -7      core/document.cpp  
 M  +4 -0      part.cpp  
 M  +1 -0      ui/minibar.cpp  


--- branches/work/kde4/kdegraphics/kpdf/core/document.cpp #420391:420392
@@ -1173,10 +1173,6 @@
         while ( (pIt != pEnd) && (memoryToFree > 0) )
         {
             AllocatedPixmap * p = *pIt;
-#warning this should NOT be needed
-	    // TODO quick way to avoid crashes
-	    if (!d->observers[ p->id ]) return;
-	    
             if ( d->observers[ p->id ]->canUnloadPixmap( p->page ) )
             {
                 // update internal variables
@@ -1436,10 +1432,9 @@
 void KPDFDocument::slotTimedMemoryCheck()
 {
     // [MEM] clean memory (for 'free mem dependant' profiles only)
-#warning commented because makes it crash
-/*    if ( Settings::memoryLevel() != Settings::EnumMemoryLevel::Low &&
+    if ( Settings::memoryLevel() != Settings::EnumMemoryLevel::Low &&
          d->allocatedPixmapsTotalMemory > 1024*1024 )
-        cleanupPixmapMemory();*/
+        cleanupPixmapMemory();
 }
 
 
--- branches/work/kde4/kdegraphics/kpdf/part.cpp #420391:420392
@@ -127,6 +127,8 @@
 	m_leftPanel->setMinimumWidth( 90 );
 	m_leftPanel->setMaximumWidth( 300 );
 	QVBoxLayout * leftPanelLayout = new QVBoxLayout( m_leftPanel );
+	leftPanelLayout->setMargin(0);
+	leftPanelLayout->setSpacing(0);
 
 	// widgets: [left toolbox/..] | []
 	m_toolBox = new QToolBox( m_leftPanel );
@@ -166,6 +168,8 @@
 	QWidget * miniBarContainer = new QWidget( m_leftPanel );
 	leftPanelLayout->addWidget( miniBarContainer );
 	QVBoxLayout * miniBarLayout = new QVBoxLayout( miniBarContainer );
+	miniBarLayout->setMargin(0);
+	miniBarLayout->setSpacing(0);
 	// widgets: [../[spacer/..]] | []
 	QWidget * miniSpacer = new QWidget( miniBarContainer );
 	miniSpacer->setFixedHeight( 6 );
--- branches/work/kde4/kdegraphics/kpdf/ui/minibar.cpp #420391:420392
@@ -86,6 +86,7 @@
 {
     // left spacer
     QHBoxLayout * horLayout = new QHBoxLayout( this );
+    horLayout->setMargin(0);
     QSpacerItem * spacerL = new QSpacerItem( 20, 10, QSizePolicy::Expanding );
     horLayout->addItem( spacerL );
 
[prev in list] [next in list] [prev in thread] [next in thread]