[Uml-devel] kdesdk/umbrello/umbrello

[Sebastian Stein]

CVS commit by sstein: 

Please revert this small change, if you have good arguments why this doesn't improve the handling:

When right clicking on the background of a diagram, the default tool is selected from the toolbar and the context menu is not shown. You have to right click one more time to get to the context menu.
This is only valid, if there is really no widget like a class under the mouse pointer. In this case the right click menu is always shown!


  M +11 -2     umlview.cpp   1.83


--- kdesdk/umbrello/umbrello/umlview.cpp  #1.82:1.83
@@ -276,4 +276,13 @@ void UMLView::contentsMouseReleaseEvent(
                 viewport()->setMouseTracking( false );
                 if (me->state() == RightButton) {
+
+                        /* if the user right clicks on the diagram, first the default tool is
+                         * selected from the toolbar; this only happens when the default tool
+                         * wasn't selected yet AND there is no other widget under the mouse
+                         * pointer
+                         * in any other case the right click menu will be shown */
+                        if ( m_CurrentCursor != WorkToolBar::tbb_Arrow )
+                                UMLApp::app()->getWorkToolBar()->setDefaultTool();
+                        else            
                         setMenu();
                 }
@@ -1789,5 +1798,5 @@ void UMLView::removeAssoc(AssociationWid
 }
 
-void UMLView::removeAssocInViewAndDoc(AssociationWidget* a, bool deleteLater) {
+void UMLView::removeAssocInViewAndDoc(AssociationWidget* a, bool /* deleteLater */) {
         if(!a)
                 return;