vitalif
/
openscad
mirror of https://github.com/vitalif/openscad
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #1227 from openscad/alpha-marker-fix 

Workaround for colors with alpha part in Qt4
master
Marius Kintel 2015-02-26 23:43:06 -05:00
parent b9e1b6603e c6bac0be69
commit 3c3ac52576
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/scintillaeditor.cpp
View File

@ -1,3 +1,4 @@
#include <stdlib.h>
#include <algorithm>
#include <QString>
#include <QChar>
@ -225,6 +226,15 @@ QColor ScintillaEditor::readColor(const boost::property_tree::ptree &pt, const s
{
try {
const std::string val = pt.get<std::string>(name);
#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
if ((val.length() == 9) && (val.at(0) == '#')) {
const std::string rgb = std::string("#") + val.substr(3);
QColor qcol(rgb.c_str());
unsigned long alpha = std::strtoul(val.substr(1, 2).c_str(), 0, 16);
qcol.setAlpha(alpha);
return qcol;
}
#endif
return QColor(val.c_str());
} catch (std::exception e) {
return defaultColor;

2
src/scintillaeditor.h
View File

@ -91,7 +91,7 @@ private slots:
private:
QVBoxLayout *scintillaLayout;
static const int indicatorNumber = 1;
static const int indicatorNumber = 8; // first 8 are used by lexers
static const int markerNumber = 2;
ScadLexer *lexer;
};