[Libreoffice-commits] core.git: include/svx
Luc Castermans
luc.castermans at gmail.com
Fri Oct 2 12:07:25 PDT 2015
include/svx/svdhdl.hxx | 98 +++++++++++++++++++++++--------------------------
1 file changed, 47 insertions(+), 51 deletions(-)
New commits:
commit 0191db4a009bb9c3839a5d209f63119859a5e9cb
Author: Luc Castermans <luc.castermans at gmail.com>
Date: Sat Sep 26 15:31:14 2015 +0200
Translated German Comments - fixed review Michael Stahl
Change-Id: I463d88aac31765b989bdae9db57c2f9933f390f3
Reviewed-on: https://gerrit.libreoffice.org/18886
Reviewed-by: Michael Stahl <mstahl at redhat.com>
Tested-by: Michael Stahl <mstahl at redhat.com>
diff --git a/include/svx/svdhdl.hxx b/include/svx/svdhdl.hxx
index 1fa5641..ce0e73e 100644
--- a/include/svx/svdhdl.hxx
+++ b/include/svx/svdhdl.hxx
@@ -43,37 +43,35 @@ class MouseEvent;
// Every object must be able to create its handles. They will be fetched on
// selection, registered at the View and made visible.
-// Wird ein Handle von der Maus beruehrt (IsHit()), so wird von der View der
-// entsprechende Mauszeiger vom Handle abgeholt und der App auf Anfrage zum
-// reinschalten uebergeben.
-// Handles wie z.B. der Rotationsmittelpunkt oder die Spiegelachse werden von
-// der View generiert, wenn vom Controller der entsprechende Transformations-
-// Modus selektiert wird.
-// HDL_MOVE...HDL_LWRGT muessen im enum immer zusammen stehen bleiben!
+// When a handle is touched by the mouse (IsHit()), from the view the matching mouse pointer
+// is picked up from the handle and passed to the app (on demand) to be switched on
+// Handles like e.g. rotation center or the mirror axis are generated by
+// the view if the correct transformation mode was selected by the controller.
+// HDL_MOVE...HDL_LWRGT should always be consecutive in the enum!
enum SdrHdlKind
{
- HDL_MOVE, // Handle zum Verschieben des Objekts
- HDL_UPLFT, // Oben links
- HDL_UPPER, // Oben
- HDL_UPRGT, // Oben rechts
- HDL_LEFT, // Links
- HDL_RIGHT, // Rechts
- HDL_LWLFT, // Unten links
- HDL_LOWER, // Unten
- HDL_LWRGT, // Unten rechts
- HDL_POLY, // Punktselektion an Polygon oder Bezierkurve
- HDL_BWGT, // Gewicht an einer Bezierkurve
- HDL_CIRC, // Winkel an Kreissegmenten, Eckenradius am Rect
- HDL_REF1, // Referenzpunkt 1, z.B. Rotationsmitte
- HDL_REF2, // Referenzpunkt 2, z.B. Endpunkt der Spiegelachse
- HDL_MIRX, // Die Spiegelachse selbst
+ HDL_MOVE, // Handle to move the object
+ HDL_UPLFT, // Upper left
+ HDL_UPPER, // Upper
+ HDL_UPRGT, // Upper right
+ HDL_LEFT, // Left
+ HDL_RIGHT, // Right
+ HDL_LWLFT, // Bottom left
+ HDL_LOWER, // Bottom
+ HDL_LWRGT, // Bottom right
+ HDL_POLY, // Select point in polygon or beziercurve
+ HDL_BWGT, // Weight of a beziercurve
+ HDL_CIRC, // Angle to circle segment, corner radius to rectangle
+ HDL_REF1, // Reference point 1, e.g. rotation center
+ HDL_REF2, // Reference point 2, e.g. endpoint of mirror axis
+ HDL_MIRX, // Mirror axis
HDL_GLUE, // GluePoint
HDL_GLUE_DESELECTED, // GluePoint
- HDL_ANCHOR, // anchor symbol (SD, SW)
- HDL_TRNS, // interactive transparence
- HDL_GRAD, // interactive gradient
- HDL_COLR, // interactive color
+ HDL_ANCHOR, // Anchor symbol (SD, SW)
+ HDL_TRNS, // Interactive transparence
+ HDL_GRAD, // Interactive gradient
+ HDL_COLR, // Interactive color
HDL_USER,
HDL_ANCHOR_TR, // #101688# Anchor handle with (0,0) at top right for SW
@@ -135,16 +133,15 @@ enum BitmapMarkerKind
class SVX_DLLPUBLIC SdrHdl
{
- friend class SdrMarkView; // fuer den Zugriff auf nObjHdlNum
+ friend class SdrMarkView; // for the access to nObjHdlNum
friend class SdrHdlList;
static BitmapEx ImpGetBitmapEx(BitmapMarkerKind eKindOfMarker, sal_uInt16 nInd);
protected:
- SdrObject* pObj; // Gehoert das Handle zu einem Objekt?
- SdrPageView* pPV; // Gehoert das Handle zu einem Objekt in einer bestimmten PageView?
- SdrHdlList* pHdlList; // Zum Feststelen der Handlegroesse
-
+ SdrObject* pObj; // does handle belong to an object?
+ SdrPageView* pPV; // does handle belong to an object in certain pageview?
+ SdrHdlList* pHdlList; // to store the handlesize
// OVERLAYMANAGER
sdr::overlay::OverlayObjectList maOverlayGroup;
@@ -152,17 +149,17 @@ protected:
SdrHdlKind eKind;
- long nRotationAngle; // Handles bzw. Mauszeiger drehen
- sal_uInt32 nObjHdlNum; // wird von der MarkView benoetigt
- sal_uInt32 nPolyNum; // Polygonpunktes
- sal_uInt32 nPPntNum; // Punktnummer des Polygons
- sal_uInt32 nSourceHdlNum; // ist noch vollstaendig zu implementieren
+ long nRotationAngle; // turn handle or mouspointer
+ sal_uInt32 nObjHdlNum; // required by MarkView
+ sal_uInt32 nPolyNum; // Polygonpoint
+ sal_uInt32 nPPntNum; // Point number of the polygon
+ sal_uInt32 nSourceHdlNum; // still to implement
- bool bSelect : 1; // Ein selektierter Polygonpunkt?
- bool b1PixMore : 1; // True=Handle wird 1 Pixel groesser dargestellt
- bool bPlusHdl : 1; // u.a. fuer Hld-Paint Optimierung bei MarkPoint/UnmarkPoint, ...
+ bool bSelect : 1; // is a polygon point selected?
+ bool b1PixMore : 1; // True=handle is shown 1 pixel larger
+ bool bPlusHdl : 1; // for Hld-Paint optimisation at MarkPoint/UnmarkPoint, and other ...
- bool mbMoveOutside; // forces this handle to be moved outside of the selection rectangle
+ bool mbMoveOutside; // forces this handle to be moved outside of the selection rectangle
// create marker for this kind
virtual void CreateB2dIAObject();
@@ -353,9 +350,9 @@ public:
virtual Pointer GetPointer() const SAL_OVERRIDE;
};
-// Ein SdrHdlBezWgt hat Kenntnis von seinem "BasisHandle". Seine Draw-Methode
-// zeichnet zusaetzlich eine Linie von seiner Position zur Position dieses
-// BasisHandles.
+// a SdrHdlBezWgt knows about its "base handle". Its draw method
+// draws additionally a line from its position to the position
+// of the base handle
class SdrHdlBezWgt: public SdrHdl
{
// create marker for this kind
@@ -365,7 +362,7 @@ protected:
const SdrHdl* pHdl1;
public:
- // das ist kein Copy-Ctor!!!
+ // this is not a Copy-Ctor!!!
SdrHdlBezWgt(const SdrHdl* pRefHdl1, SdrHdlKind eNewKind=HDL_BWGT) { eKind=eNewKind; pHdl1=pRefHdl1; }
virtual ~SdrHdlBezWgt();
};
@@ -465,9 +462,9 @@ public:
// Access to View
SdrMarkView* GetView() const { return pView;}
- // Sortierung: 1.Level Erst Refpunkt-Handles, dann normale Handles, dann Glue, dann User, dann Plushandles
- // 2.Level PageView (Pointer)
- // 3.Level Position (x+y)
+ // Sorting: 1.Level first reference point handle, then normal handles, next Glue, then User then Plushandles
+ // 2.Level PageView (Pointer)
+ // 3.Level Position (x+y)
void Sort();
size_t GetHdlCount() const { return aList.size(); }
SdrHdl* GetHdl(size_t nNum) const { return nNum<aList.size() ? aList[nNum] : NULL; }
@@ -481,14 +478,13 @@ public:
void SetDistortShear(bool bOn);
bool IsDistortShear() const { return bDistortShear; }
- // AddHdl uebernimmt das Handle in sein Eigentum. Es muss
- // also auf dem Heap stehen, da Clear() ein delete macht.
+ // AddHdl takes ownership of the handle. It should be on the Heap
+ // as Clear() deletes it.
void AddHdl(SdrHdl* pHdl, bool bAtBegin=false);
SdrHdl* RemoveHdl(size_t nNum);
void RemoveAllByKind(SdrHdlKind eKind);
- // Zuletzt eingefuegte Handles werden am ehesten getroffen
- // (wenn Handles uebereinander liegen).
+ // Last inserted handles are likely hit (if the handles are above each other)
SdrHdl* IsHdlListHit(const Point& rPnt, bool bBack=false, bool bNext=false, SdrHdl* pHdl0=NULL) const;
SdrHdl* GetHdl(SdrHdlKind eKind1) const;
};
More information about the Libreoffice-commits
mailing list