some fixes

1 files changed, 11 insertions, 3 deletions

diff --git a/microkde/kdeui/klistview.cpp b/microkde/kdeui/klistview.cpp
index 6859d36..154cd02 100644
--- a/microkde/kdeui/klistview.cpp
+++ b/microkde/kdeui/klistview.cpp
@@ -1888,51 +1888,59 @@ QListViewItem* KListView::itemAtIndex(int index)
    {
       if (j==index)
          return it.current();
       j++;
    };
    return 0;
 }
 
 
 void KListView::emitContextMenu (KListView*, QListViewItem* i)
 {
   QPoint p;
   //    qDebug("KListView::emitContextMenu ");
 
   if (i)
         p = viewport()->mapToGlobal(itemRect(i).center());
   else
         p = mapToGlobal(rect().center());
 
   emit contextMenu (this, i, p);
 }
 
 void KListView::emitContextMenu (QListViewItem* i, const QPoint& p, int col)
 {
-  //    qDebug("KListView::emitContextMenu col");
-    emit contextRequest( i, p,  col );
-    emit contextMenu (this, i, p);
+    QListViewItem* item = i;
+    int c = col;
+    // do not trust the values for QListViewItem* i and int col;
+    //    qDebug("KListView::emitContextMenu col");
+    if ( col == -1 ) {
+        QPoint pp =  viewport()->mapFromGlobal(p);
+        item = itemAt( pp);
+        c = header()->sectionAt(pp.x() );
+    }
+    emit contextRequest( item, p,  c );
+    emit contextMenu (this, item, p);
 }
 
 void KListView::setAcceptDrops (bool val)
 {
   QListView::setAcceptDrops (val);
   viewport()->setAcceptDrops (val);
 }
 
 int KListView::dropVisualizerWidth () const
 {
         return d->mDropVisualizerWidth;
 }
 
 
 void KListView::viewportPaintEvent(QPaintEvent *e)
 {
   QListView::viewportPaintEvent(e);
 
   if (d->mOldDropVisualizer.isValid() && e->rect().intersects(d->mOldDropVisualizer))
     {
       QPainter painter(viewport());
 
       // This is where we actually draw the drop-visualizer
       painter.fillRect(d->mOldDropVisualizer, Dense4Pattern);