From 4bc091e8ae56bd8678a43ea76b4f1f38927ab72a Mon Sep 17 00:00:00 2001 From: Jan Holthuis Date: Tue, 3 Mar 2020 18:31:20 +0100 Subject: wcolorpickeraction: Use current track color palette when opening menu --- src/widget/wcolorpickeraction.cpp | 4 ++++ src/widget/wcolorpickeraction.h | 1 + src/widget/wtracktableview.cpp | 3 +++ 3 files changed, 8 insertions(+) (limited to 'src/widget') diff --git a/src/widget/wcolorpickeraction.cpp b/src/widget/wcolorpickeraction.cpp index b57f1e4b78..8837695ac6 100644 --- a/src/widget/wcolorpickeraction.cpp +++ b/src/widget/wcolorpickeraction.cpp @@ -20,3 +20,7 @@ void WColorPickerAction::resetSelectedColor() { void WColorPickerAction::setSelectedColor(mixxx::RgbColor::optional_t color) { m_pColorPicker->setSelectedColor(color); } + +void WColorPickerAction::setColorPalette(const ColorPalette& palette) { + m_pColorPicker->setColorPalette(palette); +} diff --git a/src/widget/wcolorpickeraction.h b/src/widget/wcolorpickeraction.h index e7ca0095b4..ce222ff49c 100644 --- a/src/widget/wcolorpickeraction.h +++ b/src/widget/wcolorpickeraction.h @@ -17,6 +17,7 @@ class WColorPickerAction : public QWidgetAction { void resetSelectedColor(); void setSelectedColor(mixxx::RgbColor::optional_t color); + void setColorPalette(const ColorPalette& palette); signals: void colorPicked(mixxx::RgbColor::optional_t color); diff --git a/src/widget/wtracktableview.cpp b/src/widget/wtracktableview.cpp index a22b51cbc6..a3e8c9a9be 100644 --- a/src/widget/wtracktableview.cpp +++ b/src/widget/wtracktableview.cpp @@ -1089,6 +1089,9 @@ void WTrackTableView::contextMenuEvent(QContextMenuEvent* event) { // Track color menu only appears if at least one track is selected if (indices.size()) { + m_pColorPickerAction->setColorPalette( + ColorPaletteSettings(m_pConfig).getTrackColorPalette()); + // Get color of first selected track int column = trackModel->fieldIndex(LIBRARYTABLE_COLOR); QModelIndex index = indices.at(0).sibling(indices.at(0).row(), column); -- cgit v1.2.3