ardour/livetrax
13
0
Fork 0
Code

Theme-manager: sort colors by name (not hue)

Browse Source
This commit is contained in:
Robin Gareus 2019-09-26 19:39:13 +02:00
parent 065c09e418
commit 7850547e12
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gtk2_ardour/color_theme_manager.cc
View File

@ -281,16 +281,15 @@ struct NamedColor {
NamedColor (string s, Gtkmm2ext::HSV c) : name (s), color (c) {}
};
struct SortByHue {
struct SortNamedColor {
bool operator() (NamedColor const & a, NamedColor const & b) {
using namespace ArdourCanvas;
const HSV black (0, 0, 0);
if (a.color.is_gray() || b.color.is_gray()) {
return black.distance (a.color) < black.distance (b.color);
} else {
return a.color.h < b.color.h;
// const HSV red (rgba_to_color (1.0, 0.0, 0.0, 1.0));
// return red.distance (a.color) < red.distance (b.color);
return a.name < b.name;
}
}
};
@ -308,7 +307,7 @@ ColorThemeManager::build_palette_canvas (ArdourCanvas::Canvas& canvas, ArdourCan
for (UIConfiguration::Colors::const_iterator x = colors.begin(); x != colors.end(); ++x) {
nc.push_back (NamedColor (x->first, HSV (x->second)));
}
SortByHue sorter;
SortNamedColor sorter;
sort (nc.begin(), nc.end(), sorter);
const uint32_t color_limit = nc.size();