Skip to content

Commit

Permalink
do not raise canvas but window (fix hiding message bar)
Browse files Browse the repository at this point in the history
  • Loading branch information
3nids committed Sep 17, 2014
1 parent 9ebb69e commit f8228a2
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/gui/editorwidgets/qgsrelationreferencewidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ QgsRelationReferenceWidget::QgsRelationReferenceWidget( QWidget* parent )
QgsRelationReferenceWidget::~QgsRelationReferenceWidget()
{
deleteHighlight();
unsetMapTool();
delete mMapTool;
}

Expand Down Expand Up @@ -517,9 +518,8 @@ void QgsRelationReferenceWidget::mapIdentification()
mCanvas->setMapTool( mMapTool );

mWindowWidget = window();
connect( mWindowWidget, SIGNAL( destroyed() ), this, SLOT( unsetMapTool() ) );

mCanvas->raise();
mCanvas->window()->raise();
mCanvas->activateWindow();

connect( mMapTool, SIGNAL( featureIdentified( QgsFeature ) ), this, SLOT( featureIdentified( const QgsFeature ) ) );
Expand All @@ -529,7 +529,7 @@ void QgsRelationReferenceWidget::mapIdentification()
{
QString title = QString( "Relation %1 for %2." ).arg( mRelationName ).arg( mReferencingLayer->name() );
QString msg = tr( "Identify a feature of %1 to be associated. Press <ESC> to cancel." ).arg( mReferencedLayer->name() );
mMessageBarItem = QgsMessageBar::createMessage( title, msg );
mMessageBarItem = QgsMessageBar::createMessage( title, msg, this );
mMessageBar->pushItem( mMessageBarItem );
}
}
Expand Down

0 comments on commit f8228a2

Please sign in to comment.