mapeditor.cpp
changeset 329 8f04006214dc
parent 314 549bb67a8ab2
child 336 5b6f2a396979
     1.1 --- a/mapeditor.cpp	Mon May 15 07:32:10 2006 +0000
     1.2 +++ b/mapeditor.cpp	Mon May 15 07:32:11 2006 +0000
     1.3 @@ -3189,16 +3189,26 @@
     1.4  		updateActions();
     1.5  		canvasContextMenu->popup(e->globalPos() );
     1.6      } 
     1.7 +	e->accept();
     1.8  }
     1.9  
    1.10  void MapEditor::contentsMousePressEvent(QMouseEvent* e)
    1.11  {
    1.12 +	// Ignore right clicks, these will go to context menus
    1.13 +	if (e->button() == QMouseEvent::RightButton )
    1.14 +	{
    1.15 +		e->ignore();
    1.16 +		return;
    1.17 +	}
    1.18 +
    1.19  	// Finish open lineEdits
    1.20  	if (lineedit) finishedLineEdit();
    1.21  	
    1.22      QPoint p = inverseWorldMatrix().map(e->pos());
    1.23      LinkableMapObj* lmo=mapCenter->findMapObj(p, NULL);
    1.24  	
    1.25 +	e->accept();
    1.26 +
    1.27  	//Take care of clickdesystem flags _or_ modifier modes
    1.28  	//
    1.29  	if (lmo && (typeid(*lmo)==typeid(BranchObj) ||