Skip to content
Permalink
Browse files

Fix annotation colors are modified when cancel is clicked

(cherry-picked from 95fd61c)
  • Loading branch information
nyalldawson committed Jul 26, 2016
1 parent 8b4ef9c commit cc98faaae84594e4b28e074edcb8c809518921c4
Showing with 0 additions and 22 deletions.
  1. +0 −20 src/app/qgsannotationwidget.cpp
  2. +0 −2 src/app/qgsannotationwidget.h
@@ -112,16 +112,6 @@ void QgsAnnotationWidget::on_mMapMarkerButton_clicked()
}
}

void QgsAnnotationWidget::on_mFrameColorButton_colorChanged( const QColor &color )
{
if ( !mItem )
{
return;
}

mItem->setFrameColor( color );
}

void QgsAnnotationWidget::updateCenterIcon()
{
if ( !mMarkerSymbol )
@@ -132,13 +122,3 @@ void QgsAnnotationWidget::updateCenterIcon()
mMapMarkerButton->setIcon( icon );
}

void QgsAnnotationWidget::on_mBackgroundColorButton_colorChanged( const QColor &color )
{
if ( !mItem )
{
return;
}

mItem->setFrameBackgroundColor( color );
}

@@ -36,8 +36,6 @@ class APP_EXPORT QgsAnnotationWidget: public QWidget, private Ui::QgsAnnotationW

private slots:
void on_mMapMarkerButton_clicked();
void on_mFrameColorButton_colorChanged( const QColor &color );
void on_mBackgroundColorButton_colorChanged( const QColor &color );

private:
QgsAnnotationItem* mItem;

0 comments on commit cc98faa

Please sign in to comment.
You can’t perform that action at this time.