Hookup line and fill color buttons in object editor.

This commit is contained in:
Jim Evins
2015-08-19 00:13:36 -04:00
parent 02b00b1511
commit b1bfdc6952
3 changed files with 4 additions and 3 deletions
+1 -2
View File
@@ -111,9 +111,8 @@ namespace glabels
} }
ColorNode ColorButton::getColorNode( bool& isDefault ) ColorNode ColorButton::colorNode()
{ {
isDefault = mIsDefault;
return mColorNode; return mColorNode;
} }
+1 -1
View File
@@ -60,7 +60,7 @@ namespace glabels
void setColorNode( ColorNode colorNode ); void setColorNode( ColorNode colorNode );
void setColor( QColor color ); void setColor( QColor color );
void setToDefault(); void setToDefault();
ColorNode getColorNode( bool& isDefault ); ColorNode colorNode();
void setKeys( const QList<QString> keyList ); void setKeys( const QList<QString> keyList );
void clearKeys(); void clearKeys();
+2
View File
@@ -140,11 +140,13 @@ namespace glabels
void ObjectEditor::onLineControlsChanged() void ObjectEditor::onLineControlsChanged()
{ {
mObject->setLineWidth( lineWidthSpin->value() ); mObject->setLineWidth( lineWidthSpin->value() );
mObject->setLineColorNode( lineColorButton->colorNode() );
} }
void ObjectEditor::onFillControlsChanged() void ObjectEditor::onFillControlsChanged()
{ {
mObject->setFillColorNode( fillColorButton->colorNode() );
} }