diff options
| author | Eduard Braun <eduard.braun2@gmx.de> | 2017-07-09 12:42:10 +0000 |
|---|---|---|
| committer | Eduard Braun <eduard.braun2@gmx.de> | 2017-07-09 12:42:10 +0000 |
| commit | 241554b7ad311b5868ba284c7a4e6a410432b9bd (patch) | |
| tree | 8bf6fed572d27e9b97ca60b90ae1684ba4856eeb /src/gradient-drag.cpp | |
| parent | Use .xml when exporting shortcuts by default (diff) | |
| parent | Shortcuts: Fix for 7d248fbba5b0c24d9a24cda8c3f2e79f96395553 (is_user_set was ... (diff) | |
| download | inkscape-241554b7ad311b5868ba284c7a4e6a410432b9bd.tar.gz inkscape-241554b7ad311b5868ba284c7a4e6a410432b9bd.zip | |
Merge branch 'master' into shortcuts
Diffstat (limited to 'src/gradient-drag.cpp')
| -rw-r--r-- | src/gradient-drag.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/gradient-drag.cpp b/src/gradient-drag.cpp index 006e2f790..103a3df9c 100644 --- a/src/gradient-drag.cpp +++ b/src/gradient-drag.cpp @@ -1517,7 +1517,7 @@ void GrDragger::updateKnotShape() // For highlighting mesh handles corresponding to selected corner if (this->knot->shape == SP_KNOT_SHAPE_TRIANGLE) { - this->knot->setFill(GR_KNOT_COLOR_HIGHLIGHT, GR_KNOT_COLOR_MOUSEOVER, GR_KNOT_COLOR_MOUSEOVER); + this->knot->setFill(GR_KNOT_COLOR_HIGHLIGHT, GR_KNOT_COLOR_MOUSEOVER, GR_KNOT_COLOR_MOUSEOVER, GR_KNOT_COLOR_MOUSEOVER); if (gr_knot_shapes[last->point_type] == SP_KNOT_SHAPE_CIRCLE) { g_object_set (G_OBJECT (this->knot->item), "shape", SP_KNOT_SHAPE_TRIANGLE, NULL); } @@ -1664,8 +1664,8 @@ GrDragger::GrDragger(GrDrag *parent, Geom::Point p, GrDraggable *draggable) if (draggable && draggable->point_type == POINT_MG_CORNER) { fill_color = GR_KNOT_COLOR_MESHCORNER; } - this->knot->setFill(fill_color, GR_KNOT_COLOR_MOUSEOVER, GR_KNOT_COLOR_MOUSEOVER); - this->knot->setStroke(0x0000007f, 0x0000007f, 0x0000007f); + this->knot->setFill(fill_color, GR_KNOT_COLOR_MOUSEOVER, GR_KNOT_COLOR_MOUSEOVER, GR_KNOT_COLOR_MOUSEOVER); + this->knot->setStroke(0x0000007f, 0x0000007f, 0x0000007f, 0x0000007f); this->updateControlSizesOverload(this->knot); this->knot->updateCtrl(); @@ -1837,9 +1837,9 @@ void GrDragger::highlightNode(SPMeshNode* node, bool highlight, Geom::Point corn SPKnot *knot = d->knot; if (highlight) { - knot->setFill(GR_KNOT_COLOR_HIGHLIGHT, GR_KNOT_COLOR_MOUSEOVER, GR_KNOT_COLOR_MOUSEOVER); + knot->setFill(GR_KNOT_COLOR_HIGHLIGHT, GR_KNOT_COLOR_MOUSEOVER, GR_KNOT_COLOR_MOUSEOVER, GR_KNOT_COLOR_MOUSEOVER); } else { - knot->setFill(GR_KNOT_COLOR_NORMAL, GR_KNOT_COLOR_MOUSEOVER, GR_KNOT_COLOR_MOUSEOVER); + knot->setFill(GR_KNOT_COLOR_NORMAL, GR_KNOT_COLOR_MOUSEOVER, GR_KNOT_COLOR_MOUSEOVER, GR_KNOT_COLOR_MOUSEOVER); } if (type == POINT_MG_HANDLE) { |