Push temporary color list down into ColorHistory.

This commit is contained in:
Jim Evins
2018-02-11 16:21:35 -05:00
parent 6e6a1fab72
commit 9aff6c2e2f
3 changed files with 9 additions and 1 deletions
+7
View File
@@ -74,6 +74,13 @@ namespace glabels
} }
QColor ColorHistory::getColor( int id )
{
QList<QColor> colors = readColorList();
return colors[id];
}
QList<QColor> ColorHistory::readColorList() QList<QColor> ColorHistory::readColorList()
{ {
QStringList defaultList; QStringList defaultList;
+1
View File
@@ -62,6 +62,7 @@ namespace glabels
public: public:
void addColor( const QColor &color ); void addColor( const QColor &color );
QList<QColor> getColors(); QList<QColor> getColors();
QColor getColor( int id );
///////////////////////////////// /////////////////////////////////
+1 -1
View File
@@ -242,7 +242,7 @@ namespace glabels
void ColorPaletteDialog::onHistoryItemActivated( int id ) void ColorPaletteDialog::onHistoryItemActivated( int id )
{ {
mColorNode.setField( false ); mColorNode.setField( false );
mColorNode.setColor( mColorHistory->getColors()[id] ); mColorNode.setColor( mColorHistory->getColor(id) );
mColorNode.setKey( "" ); mColorNode.setKey( "" );
emit colorChanged( mColorNode, false ); emit colorChanged( mColorNode, false );