Skip to content

Commit

Permalink
partial revert of 96aa26f
Browse files Browse the repository at this point in the history
  • Loading branch information
m-kuhn committed May 20, 2017
1 parent 1fb7fe1 commit 5464938
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 5 deletions.
5 changes: 1 addition & 4 deletions src/gui/qgsrelationeditorwidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ QgsRelationEditorWidget::QgsRelationEditorWidget( QWidget* parent )
, mViewMode( QgsDualView::AttributeEditor )
, mShowLabel( true )
, mVisible( false )
, mInitialized( false )
{
QVBoxLayout* topLayout = new QVBoxLayout( this );
topLayout->setContentsMargins( 0, 9, 0, 0 );
Expand Down Expand Up @@ -181,7 +180,6 @@ void QgsRelationEditorWidget::setRelationFeature( const QgsRelation& relation, c
QgsFeatureRequest myRequest = mRelation.getRelatedFeaturesRequest( mFeature );

mDualView->init( mRelation.referencingLayer(), nullptr, myRequest, mEditorContext );
mInitialized = true;
}
}

Expand Down Expand Up @@ -523,7 +521,7 @@ void QgsRelationEditorWidget::updateUi()
// If it is already initialized, it has been set visible before and the currently shown feature is changing
// and the widget needs updating

if ( mVisible && !mInitialized )
if ( mVisible )
{
QgsFeatureRequest myRequest = mRelation.getRelatedFeaturesRequest( mFeature );

Expand Down Expand Up @@ -551,7 +549,6 @@ void QgsRelationEditorWidget::updateUi()
{
mDualView->init( mRelation.referencingLayer(), nullptr, myRequest, mEditorContext );
}
mInitialized = true;
}

mToggleEditingButton->setVisible( true );
Expand Down
1 change: 0 additions & 1 deletion src/gui/qgsrelationeditorwidget.h
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,6 @@ class GUI_EXPORT QgsRelationEditorWidget : public QgsCollapsibleGroupBox

bool mShowLabel;
bool mVisible;
bool mInitialized;
};

#endif // QGSRELATIONEDITOR_H

0 comments on commit 5464938

Please sign in to comment.