2 files changed, 23 insertions, 14 deletions

diff --git a/noncore/graphics/opie-eye/gui/iconview.cpp b/noncore/graphics/opie-eye/gui/iconview.cpp
index ed9fc9c..4a20648 100644
--- a/noncore/graphics/opie-eye/gui/iconview.cpp
+++ b/noncore/graphics/opie-eye/gui/iconview.cpp
@@ -61,12 +61,11 @@ namespace {
     QMap<QString, IconViewItem*> g_stringPix;
 
     IconViewItem::IconViewItem( QIconView* view,const QString& path,
                                 const QString& name, bool isDir )
-        : QIconViewItem( view ), m_path( path ), m_isDir( isDir ),
+        : QIconViewItem( view, name ), m_path( path ), m_isDir( isDir ),
           m_noInfo( false )
     {
-        QIconViewItem::setText( name );
         if ( isDir && !_dirPix )
             _dirPix = new QPixmap( Resource::loadPixmap("advancedfm/FileBrowser"));
         else if ( !isDir && !_unkPix )
             _unkPix = new QPixmap( Resource::loadPixmap( "UnknownDocument" ) );
@@ -100,9 +99,9 @@ namespace {
 }
 
 
 PIconView::PIconView( QWidget* wid, Opie::Core::OConfig* cfg )
-    : QVBox( wid ), m_cfg( cfg )
+    : QVBox( wid ), m_cfg( cfg ), m_updatet( false )
 {
     {
         QCopEnvelope( "QPE/Application/opie-eye_slave", "refUp()" );
     }
@@ -307,29 +306,34 @@ void PIconView::slotClicked(QIconViewItem* _it) {
         ;
 }
 
 void PIconView::slotThumbInfo( const QString& _path, const QString& str ) {
-    if ( g_stringInf.contains( _path ) ) {
         IconViewItem* item = g_stringInf[_path];
-        /* if set the view shows nonsens!
-           I dont know how to fix the format of displayed text :(*/
+    if (!item )
+        return;
+
+    if ( item->intersects(QRect( m_view->contentsX(),m_view->contentsY(),
+                                 m_view->contentsWidth(), m_view->contentsHeight() ) ) )
+        m_updatet = true;
+
         item->setText( str );
         g_stringInf.remove( _path );
     }
-}
 void PIconView::slotThumbNail(const QString& _path, const QPixmap &pix) {
-    if ( g_stringPix.contains( _path ) ) {
         IconViewItem* item = g_stringPix[_path];
+    if (!item )
+        return;
 
-        if (pix.width()>0) {
+    if ( item->intersects(QRect( m_view->contentsX(),m_view->contentsY(),
+                                 m_view->contentsWidth(), m_view->contentsHeight() ) ) )
+        m_updatet = true;
+
+    if (pix.width()>0)
             PPixmapCache::self()->insertImage( _path, pix, 64, 64 );
-            /* required for a recalculated rectangle. otherwise the view show nonsense! */
-        } else {
-            PPixmapCache::self()->insertImage(_path,Resource::loadPixmap( "UnknownDocument" ),64,64 );
-        }
+
+
         g_stringPix.remove( _path );
     }
-}
 
 
 void PIconView::slotRename() {
 
@@ -353,13 +357,17 @@ void PIconView::slotBeamDone( Ir* ir) {
 }
 
 void PIconView::slotStart() {
     m_view->viewport()->setUpdatesEnabled( false );
+    qWarning( "Sig Start" );
 }
 
 void PIconView::slotEnd() {
+    qWarning( "SLot End" );
+    if ( m_updatet )
     m_view->arrangeItemsInGrid( );
     m_view->viewport()->setUpdatesEnabled( true );
+    m_updatet = false;
 }
 
 void PIconView::slotShowImage() {
 
diff --git a/noncore/graphics/opie-eye/gui/iconview.h b/noncore/graphics/opie-eye/gui/iconview.h
index 0fba327..7ddb023 100644
--- a/noncore/graphics/opie-eye/gui/iconview.h
+++ b/noncore/graphics/opie-eye/gui/iconview.h
@@ -73,7 +73,8 @@ private:
     Opie::Core::OConfig *m_cfg;
     QComboBox* m_views;
     QIconView* m_view;
     QString m_path;
+    bool m_updatet : 1;
 };
 
 #endif