X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fuisupport%2Fbufferview.cpp;h=6bc01d870e71baf37705f6635b6b328b7c0ec213;hb=89c07686d193fe31e1b3ea45735b3f5a0d1e6cfb;hp=6cf3e502160ad69993a76ced48dd2be4b4f16851;hpb=d1192c9aeef46d5d995c728812740b765cb98b28;p=quassel.git

diff --git a/src/uisupport/bufferview.cpp b/src/uisupport/bufferview.cpp
index 6cf3e502..6bc01d87 100644
--- a/src/uisupport/bufferview.cpp
+++ b/src/uisupport/bufferview.cpp
@@ -258,37 +258,37 @@ void BufferView::showContextMenu(const QPoint &pos) {
   }
 }
 
-void BufferView::wheelEvent(QWheelEvent* event)
-{
-  UiSettings s;
-  if(s.value("MouseWheelChangesBuffers",QVariant(true)).toBool()) {
-    int rowDelta = ( event->delta() > 0 ) ? -1 : 1;
-    QModelIndex currentIndex = selectionModel()->currentIndex();
-    QModelIndex resultingIndex;
-    if( model()->hasIndex(  currentIndex.row() + rowDelta, currentIndex.column(), currentIndex.parent() ) )
+void BufferView::wheelEvent(QWheelEvent* event) {
+  if(UiSettings().value("MouseWheelChangesBuffers", QVariant(true)).toBool() == (bool)(event->modifiers() & Qt::AltModifier))
+    return QTreeView::wheelEvent(event);
+
+  int rowDelta = ( event->delta() > 0 ) ? -1 : 1;
+  QModelIndex currentIndex = selectionModel()->currentIndex();
+  QModelIndex resultingIndex;
+  if( model()->hasIndex(  currentIndex.row() + rowDelta, currentIndex.column(), currentIndex.parent() ) )
     {
-        resultingIndex = currentIndex.sibling( currentIndex.row() + rowDelta, currentIndex.column() );
+      resultingIndex = currentIndex.sibling( currentIndex.row() + rowDelta, currentIndex.column() );
     }
     else //if we scroll into a the parent node...
-    {
+      {
         QModelIndex parent = currentIndex.parent();
         QModelIndex aunt = parent.sibling( parent.row() + rowDelta, parent.column() );
         if( rowDelta == -1 )
-            resultingIndex = aunt.child( model()->rowCount( aunt ) - 1, 0 );
+	  resultingIndex = aunt.child( model()->rowCount( aunt ) - 1, 0 );
         else
-            resultingIndex = aunt.child( 0, 0 );
+	  resultingIndex = aunt.child( 0, 0 );
         if( !resultingIndex.isValid() )
-            return;
-    }
-    selectionModel()->setCurrentIndex( resultingIndex, QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows );
-    selectionModel()->select( resultingIndex, QItemSelectionModel::ClearAndSelect );
-  } else {
-    QAbstractScrollArea::wheelEvent(event);
-  }
+	  return;
+      }
+  selectionModel()->setCurrentIndex( resultingIndex, QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows );
+  selectionModel()->select( resultingIndex, QItemSelectionModel::ClearAndSelect );
+  
 }
 
 
 QSize BufferView::sizeHint() const {
+  return QSize(120, 50);
+  
   if(!model())
     return QTreeView::sizeHint();