diff --git a/cockatrice/src/interface/widgets/general/display/charts/bars/color_bar.cpp b/cockatrice/src/interface/widgets/general/display/charts/bars/color_bar.cpp index 28118cc9c..4183e1fc6 100644 --- a/cockatrice/src/interface/widgets/general/display/charts/bars/color_bar.cpp +++ b/cockatrice/src/interface/widgets/general/display/charts/bars/color_bar.cpp @@ -1,6 +1,6 @@ #include "color_bar.h" -#include "libcockatrice/utility/color.h" +#include "../../../../../essence_chart_colors.h" #include #include @@ -19,14 +19,14 @@ #include ColorBar::ColorBar(const QMap &_colors, QWidget *parent) - : QWidget(parent), colors(GameSpecificColors::MTG::sortManaMapWUBRGCFirst(_colors)) + : QWidget(parent), colors(EssenceCharts::ordered(_colors)) { setMouseTracking(true); } void ColorBar::setColors(const QMap &_colors) { - colors = GameSpecificColors::MTG::sortManaMapWUBRGCFirst(_colors); + colors = EssenceCharts::ordered(_colors); update(); } @@ -150,19 +150,5 @@ QString ColorBar::tooltipForPosition(int x) const QColor ColorBar::colorFromName(const QString &name) const { - static QMap map = { - {"R", QColor(220, 30, 30)}, {"G", QColor(40, 170, 40)}, {"U", QColor(40, 90, 200)}, - {"W", QColor(235, 235, 230)}, {"B", QColor(30, 30, 30)}, - }; - - if (map.contains(name)) { - return map[name]; - } - - QColor c(name); - if (!c.isValid()) { - c = Qt::gray; - } - - return c; -} \ No newline at end of file + return EssenceCharts::colorFor(name); +}