# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: ao2@ao2.it-20170502105813-3215k2aytbbr64sf # target_branch: http://bazaar.launchpad.net/~inkscape.dev/inkscape\ # /trunk/ # testament_sha1: f8340b55a3fecb613616fa5face37b2d58e8ced6 # timestamp: 2017-05-02 12:58:47 +0200 # base_revision_id: nicoduf@yahoo.fr-20170501073802-ysl5kaxdyynvrfvj # # Begin patch === modified file 'src/ui/object-edit.cpp' --- src/ui/object-edit.cpp 2017-04-13 20:28:27 +0000 +++ src/ui/object-edit.cpp 2017-05-02 10:58:13 +0000 @@ -1071,6 +1071,12 @@ virtual void knot_click(unsigned int state); }; +class StarKnotHolderEntityCenter : public KnotHolderEntity { +public: + virtual Geom::Point knot_get() const; + virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state); +}; + void StarKnotHolderEntity1::knot_set(Geom::Point const &p, Geom::Point const &/*origin*/, unsigned int state) { @@ -1128,6 +1134,17 @@ } } +void +StarKnotHolderEntityCenter::knot_set(Geom::Point const &p, Geom::Point const &/*origin*/, unsigned int state) +{ + SPStar *star = dynamic_cast(item); + g_assert(star != NULL); + + star->center = snap_knot_position(p, state); + + item->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG); +} + Geom::Point StarKnotHolderEntity1::knot_get() const { @@ -1151,6 +1168,17 @@ return sp_star_get_xy(star, SP_STAR_POINT_KNOT2, 0); } +Geom::Point +StarKnotHolderEntityCenter::knot_get() const +{ + g_assert(item != NULL); + + SPStar const *star = dynamic_cast(item); + g_assert(star != NULL); + + return star->center; +} + static void sp_star_knot_click(SPItem *item, unsigned int state) { @@ -1202,6 +1230,12 @@ entity.push_back(entity2); } + StarKnotHolderEntityCenter *entity_center = new StarKnotHolderEntityCenter(); + entity_center->create(desktop, item, this, Inkscape::CTRL_TYPE_POINT, + _("Move the star"), + SP_KNOT_SHAPE_CROSS); + entity.push_back(entity_center); + add_pattern_knotholder(); } # Begin bundle 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