summaryrefslogtreecommitdiff
path: root/src/data/style.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/data/style.cpp')
-rw-r--r--src/data/style.cpp15
1 files changed, 10 insertions, 5 deletions
diff --git a/src/data/style.cpp b/src/data/style.cpp
index 41013c0..61c86d6 100644
--- a/src/data/style.cpp
+++ b/src/data/style.cpp
@@ -41,11 +41,11 @@ QString Style::name() const
return _name;
}
-QColor Style::strokeColor() const
+QColor Style::strokeColor(bool tikzitOverride) const
{
if (_data == 0) return Qt::black;
- QString col = propertyWithDefault("draw", "black");
+ QString col = propertyWithDefault("draw", "black", tikzitOverride);
QColor namedColor(col);
if (namedColor.isValid()) {
@@ -69,10 +69,15 @@ QPen Style::pen() const
return p;
}
-QString Style::propertyWithDefault(QString prop, QString def) const
+QString Style::propertyWithDefault(QString prop, QString def, bool tikzitOverride) const
{
- QString val = _data->property("tikzit " + prop);
- if (val.isNull()) val = _data->property(prop);
+ QString val;
+ if (tikzitOverride) {
+ val = _data->property("tikzit " + prop);
+ if (val.isNull()) val = _data->property(prop);
+ } else {
+ val = _data->property(prop);
+ }
if (val.isNull()) val = def;
return val;
}