fly/flightgear
1
0
Fork 0
Code Activity

Fills working again in FGQCanvas

Browse source
This commit is contained in:
James Turner 2018-06-17 15:34:00 +01:00
parent 6d83e6978d
commit c82a725e47
3 changed files with 28 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
utils/fgqcanvas/fgcanvaselement.cpp
View file

@ -47,7 +47,8 @@ QTransform qTransformFromCanvas(LocalProp* prop)
bool FGCanvasElement::isStyleProperty(QByteArray name) bool FGCanvasElement::isStyleProperty(QByteArray name)
{ {
if ((name == "font") || (name == "line-height") || (name == "alignment") if ((name == "font") || (name == "line-height") || (name == "alignment")
|| (name == "character-size") || (name == "fill") || (name == "background")) || (name == "character-size") || (name == "fill") || (name == "background")
|| (name == "fill-opacity"))
{ {
return true; return true;
} }
@ -126,9 +127,9 @@ void FGCanvasElement::polish()
_clipDirty = false; _clipDirty = false;
if (qq) { if (qq) {
if (_hasClip) { if (_hasClip) {
qq->setGlobalClip(_clipRect); // qq->setGlobalClip(_clipRect);
} else { } else {
qq->clearClip(); // qq->clearClip();
} }
} }
} }
@ -139,6 +140,11 @@ void FGCanvasElement::polish()
if (_styleDirty) { if (_styleDirty) {
_fillColor = parseColorValue(getCascadedStyle("fill")); _fillColor = parseColorValue(getCascadedStyle("fill"));
const auto opacity = getCascadedStyle("fill-opacity");
if (!opacity.isNull()) {
_fillColor.setAlphaF(opacity.toFloat());
}
_styleDirty = false; _styleDirty = false;
} }
@ -278,7 +284,7 @@ bool FGCanvasElement::onChildAdded(LocalProp *prop)
} else if (prop->name() == "update") { } else if (prop->name() == "update") {
// disable updates optionally? // disable updates optionally?
return true; return true;
} else if (nm == "clip") { } else if ((nm == "clip") || (nm == "clip-frame")) {
connect(prop, &LocalProp::valueChanged, this, &FGCanvasElement::markClipDirty); connect(prop, &LocalProp::valueChanged, this, &FGCanvasElement::markClipDirty);
return true; return true;
} }
@ -344,6 +350,7 @@ void FGCanvasElement::markClipDirty()
{ {
_clipDirty = true; _clipDirty = true;
parseCSSClip(_propertyRoot->value("clip", QVariant()).toByteArray()); parseCSSClip(_propertyRoot->value("clip", QVariant()).toByteArray());
_clipFrame = static_cast<ReferenceFrame>(_propertyRoot->value("clip-frame", 0).toInt());
requestPolish(); requestPolish();
} }
@ -490,7 +497,7 @@ void FGCanvasElement::parseCSSClip(QByteArray value)
const float left = parseCSSValue(clipRectDesc.at(3)); const float left = parseCSSValue(clipRectDesc.at(3));
_clipRect = QRectF(left, top, right - left, bottom - top); _clipRect = QRectF(left, top, right - left, bottom - top);
qDebug() << "final clip rect:" << _clipRect << "from" << value; // qDebug() << "final clip rect:" << _clipRect << "from" << value;
_hasClip = true; _hasClip = true;
requestPolish(); requestPolish();

12
utils/fgqcanvas/fgcanvaselement.h
View file

@ -32,6 +32,17 @@ class CanvasItem;
class QQuickItem; class QQuickItem;
class CanvasConnection; class CanvasConnection;
/**
* Coordinate reference frame (eg. "clip" property)
*/
enum class ReferenceFrame
{
GLOBAL, ///< Global coordinates
PARENT, ///< Coordinates relative to parent coordinate frame
LOCAL ///< Coordinates relative to local coordinates (parent
/// coordinates with local transformations applied)
};
class FGCanvasElement : public QObject class FGCanvasElement : public QObject
{ {
Q_OBJECT Q_OBJECT
@ -122,6 +133,7 @@ private:
mutable bool _clipDirty = true; mutable bool _clipDirty = true;
mutable bool _hasClip = false; mutable bool _hasClip = false;
mutable QRectF _clipRect; mutable QRectF _clipRect;
mutable ReferenceFrame _clipFrame = ReferenceFrame::GLOBAL;
void parseCSSClip(QByteArray value); void parseCSSClip(QByteArray value);
float parseCSSValue(QByteArray value) const; float parseCSSValue(QByteArray value) const;

5
utils/fgqcanvas/fgcanvaspath.cpp
View file

@ -445,6 +445,9 @@ void FGCanvasPath::doPolish()
_penDirty = false; _penDirty = false;
} }
if (_quickPath) {
_quickPath->setFillColor(fillColor());
}
} }
void FGCanvasPath::markStyleDirty() void FGCanvasPath::markStyleDirty()
@ -522,7 +525,7 @@ bool FGCanvasPath::onChildAdded(LocalProp *prop)
return true; return true;
} }
qDebug() << "path saw child:" << prop->name() << prop->index(); qWarning() << "path saw unrecognized child:" << prop->name() << prop->index();
return false; return false;
} }