diff --git a/src/knotholder.h b/src/knotholder.h
index 316db208217e74317b56227b9c304966b860848c..0b37d211c52079b2358621fd9a964f02b8cc5b30 100644 (file)
--- a/src/knotholder.h
+++ b/src/knotholder.h
#include "knot-enums.h"
#include "forward.h"
#include "libnr/nr-forward.h"
+#include <2geom/forward.h>
#include "knot-holder-entity.h"
#include <list>
}
}
-
-typedef void (* SPKnotHolderSetFunc) (SPItem *item, NR::Point const &p, NR::Point const &origin, guint state);
-typedef NR::Point (* SPKnotHolderGetFunc) (SPItem *item);
-/* fixme: Think how to make callbacks most sensitive (Lauris) */
-typedef void (* SPKnotHolderReleasedFunc) (SPItem *item);
-
class KnotHolder {
public:
KnotHolder() {} // do nothing in the default constructor
void update_knots();
- void knot_moved_handler(SPKnot *knot, NR::Point const *p, guint state);
+ void knot_moved_handler(SPKnot *knot, Geom::Point const &p, guint state);
void knot_clicked_handler(SPKnot *knot, guint state);
- void knot_ungrabbed_handler();
+ void knot_ungrabbed_handler(SPKnot *knot);
+
+ void add(KnotHolderEntity *e);
void add_pattern_knotholder();
-//private:
+ const SPItem *getItem() { return item; }
+
+ bool knot_mouseover();
+
+ friend class ShapeEditor;
+
+protected:
SPDesktop *desktop;
SPItem *item; // TODO: Remove this and keep the actual item (e.g., SPRect etc.) in the item-specific knotholders
+ Inkscape::XML::Node *repr; ///< repr of the item, for setting and releasing listeners.
std::list<KnotHolderEntity *> entity;
SPKnotHolderReleasedFunc released;
- Inkscape::XML::Node *repr; ///< repr of the item, for setting and releasing listeners.
-
gboolean local_change; ///< if true, no need to recreate knotholder if repr was changed.
+
+ bool dragging;
};
/**
void knot_clicked_handler(SPKnot *knot, guint state, gpointer data);
-void knot_moved_handler(SPKnot *knot, NR::Point const *p, guint state, gpointer data);
+void knot_moved_handler(SPKnot *knot, Geom::Point const *p, guint state, gpointer data);
void knot_ungrabbed_handler(SPKnot *knot, unsigned int state, KnotHolder *kh);
**/