Changeset c53a3f4 for src/mvc/treeview.cpp

Timestamp:

01/19/10 18:34:18 (13 years ago)

Author:

pavelpa <pavelpa@…>

Branches:

master, qt5

Children:

395d6d3

Parents:

02c1e09

Message:

single-click is used to open event dialog

File:

• src/mvc/treeview.cpp (modified) (5 diffs)

src/mvc/treeview.cpp

@@ -22 +22 @@
     QPoint point = aEvent->pos();
 
-    testForControlClicked(index,point);
-
-    // pass the event to the Base class, so item clicks/events are handled correctly
-    QTreeView::mouseReleaseEvent(aEvent);
+    // test whether we have handled the mouse event
+    if(!testForControlClicked(index,point))
+    {
+        // pass the event to the Base class, so item clicks/events are handled correctly
+        QTreeView::mouseReleaseEvent(aEvent);
+    }
 }
 
-void TreeView::testForControlClicked(const QModelIndex &aIndex, const QPoint &aPoint) 
+// returns bool if some Control was clicked
+bool TreeView::testForControlClicked(const QModelIndex &aIndex, const QPoint &aPoint) 
 {
+    bool handled = false;
+
     if(!aIndex.isValid())
-        return;
+        return handled;
 
     QRect rect = visualRect(aIndex); // visual QRect of selected/clicked item in the list
@@ -56 +61 @@
                 // since the Favourite icon has changed, update TreeView accordingly
                 static_cast<EventModel*>(model())->emitDataChangedSignal(aIndex,aIndex);
+                handled = true;
             }
             break;
@@ -89 +95 @@
                 // since the Alarm icon has changed, update TreeView accordingly
                 static_cast<EventModel*>(model())->emitDataChangedSignal(aIndex,aIndex);
-
+                handled = true;
             }
             break;
@@ -97 +103 @@
                 qDebug() << "MAP CLICKED: " << qVariantValue<QString>(aIndex.data());
                 emit(requestForMap(aIndex));
+                handled = true;
             }
         break;
@@ -103 +110 @@
             {
                 // item was clicked, but not a control
+                handled = false;
             }
     };
+
+    return handled;
 }