Mercurial > hg > svgui

comparison layer/ColourDatabase.cpp @ 1324:13d9b422f7fe zoom

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from default branch
author Chris Cannam
date Mon, 17 Sep 2018 13:51:31 +0100
parents a34a2a25907c
children f5566f7271fe
comparison
equal deleted inserted replaced
1183:57d192e26331 1324:13d9b422f7fe
158 QString colourSpec, 158 QString colourSpec,
159 QString darkbg) 159 QString darkbg)
160 { 160 {
161 int index = -1; 161 int index = -1;
162 if (colourSpec != "") { 162 if (colourSpec != "") {
163 QColor colour(colourSpec); 163 QColor colour(colourSpec);
164 index = getColourIndex(colour); 164 index = getColourIndex(colour);
165 if (index < 0) { 165 if (index < 0) {
166 index = addColour(colour, 166 index = addColour(colour,
167 colourName == "" ? colourSpec : colourName); 167 colourName == "" ? colourSpec : colourName);
168 } 168 }