Fix for tab-key moving focus instead of adding a tab character in MergeResultWindow.

git-svn-id: https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk@147 c8aa9fed-2811-0410-8543-893ada326672

kdiff3/src-QT4/mergeresultwindow.cpp

@@ -2166,7 +2166,20 @@ void MergeResultWindow::wheelEvent( QWheelEvent* e )
     scroll( 0, min2(d, getNofVisibleLines()) );
 }
 
-
+bool MergeResultWindow::event( QEvent* e )
+{
+   if ( e->type()==QEvent::KeyPress )
+   {
+      QKeyEvent *ke = static_cast<QKeyEvent *>(e);
+      if (ke->key() == Qt::Key_Tab) 
+      {
+          // special tab handling here to avoid moving focus
+          keyPressEvent( ke );
+          return true;
+      }
+   }
+   return QWidget::event(e);
+}
 void MergeResultWindow::keyPressEvent( QKeyEvent* e )
 {
    int y = m_cursorYPos;

kdiff3/src-QT4/mergeresultwindow.h

@@ -377,6 +377,7 @@ private:
       );
    void setFastSelector(MergeLineList::iterator i);
    void convertToLinePos( int x, int y, int& line, int& pos );
+   bool event(QEvent*);
    virtual void mousePressEvent ( QMouseEvent* e );
    virtual void mouseDoubleClickEvent ( QMouseEvent* e );
    virtual void mouseReleaseEvent ( QMouseEvent * );