From 9aff6c2e2fcd270115b3efb1b0de4d941e0292b2 Mon Sep 17 00:00:00 2001 From: Jim Evins Date: Sun, 11 Feb 2018 16:21:35 -0500 Subject: [PATCH] Push temporary color list down into ColorHistory. --- glabels/ColorHistory.cpp | 7 +++++++ glabels/ColorHistory.h | 1 + glabels/ColorPaletteDialog.cpp | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/glabels/ColorHistory.cpp b/glabels/ColorHistory.cpp index 7169947..e6c6d70 100644 --- a/glabels/ColorHistory.cpp +++ b/glabels/ColorHistory.cpp @@ -74,6 +74,13 @@ namespace glabels } + QColor ColorHistory::getColor( int id ) + { + QList colors = readColorList(); + return colors[id]; + } + + QList ColorHistory::readColorList() { QStringList defaultList; diff --git a/glabels/ColorHistory.h b/glabels/ColorHistory.h index db3f013..b74b3b4 100644 --- a/glabels/ColorHistory.h +++ b/glabels/ColorHistory.h @@ -62,6 +62,7 @@ namespace glabels public: void addColor( const QColor &color ); QList getColors(); + QColor getColor( int id ); ///////////////////////////////// diff --git a/glabels/ColorPaletteDialog.cpp b/glabels/ColorPaletteDialog.cpp index 9f69e74..71feb32 100644 --- a/glabels/ColorPaletteDialog.cpp +++ b/glabels/ColorPaletteDialog.cpp @@ -242,7 +242,7 @@ namespace glabels void ColorPaletteDialog::onHistoryItemActivated( int id ) { mColorNode.setField( false ); - mColorNode.setColor( mColorHistory->getColors()[id] ); + mColorNode.setColor( mColorHistory->getColor(id) ); mColorNode.setKey( "" ); emit colorChanged( mColorNode, false );