diff --git a/glabels/ColorButton.cpp b/glabels/ColorButton.cpp index 3680650..74c2dcb 100644 --- a/glabels/ColorButton.cpp +++ b/glabels/ColorButton.cpp @@ -111,9 +111,8 @@ namespace glabels } - ColorNode ColorButton::getColorNode( bool& isDefault ) + ColorNode ColorButton::colorNode() { - isDefault = mIsDefault; return mColorNode; } diff --git a/glabels/ColorButton.h b/glabels/ColorButton.h index af01a75..621e5bf 100644 --- a/glabels/ColorButton.h +++ b/glabels/ColorButton.h @@ -60,7 +60,7 @@ namespace glabels void setColorNode( ColorNode colorNode ); void setColor( QColor color ); void setToDefault(); - ColorNode getColorNode( bool& isDefault ); + ColorNode colorNode(); void setKeys( const QList keyList ); void clearKeys(); diff --git a/glabels/ObjectEditor.cpp b/glabels/ObjectEditor.cpp index af7ab10..679f891 100644 --- a/glabels/ObjectEditor.cpp +++ b/glabels/ObjectEditor.cpp @@ -140,11 +140,13 @@ namespace glabels void ObjectEditor::onLineControlsChanged() { mObject->setLineWidth( lineWidthSpin->value() ); + mObject->setLineColorNode( lineColorButton->colorNode() ); } void ObjectEditor::onFillControlsChanged() { + mObject->setFillColorNode( fillColorButton->colorNode() ); }