]> Shamusworld >> Repos - ttedit/blobdiff - src/editwindow.h
Add ability to move points with the arrow keys.
[ttedit] / src / editwindow.h
index d6f2acbffc6d189d59e187b79eedd724b2c2dcdd..652535941fd35d21e45fdd477beed0f3f14e0d4f 100755 (executable)
@@ -8,8 +8,8 @@
 #ifndef __EDITWINDOW_H__
 #define __EDITWINDOW_H__
 
-#include <QtGui>
-#include "types.h"
+#include <QtWidgets>
+#include <stdint.h>
 #include "toolwindow.h"                                                        // For ToolType enum
 #include "glyphpoints.h"
 
@@ -23,32 +23,36 @@ class EditWindow: public QWidget
                QSize sizeHint() const;
 
        protected:
-               void paintEvent(QPaintEvent * event);
-               void mousePressEvent(QMouseEvent * event);
-               void mouseMoveEvent(QMouseEvent * event);
-               void mouseReleaseEvent(QMouseEvent * event);
+               void paintEvent(QPaintEvent *);
+               void mousePressEvent(QMouseEvent *);
+               void mouseMoveEvent(QMouseEvent *);
+               void mouseReleaseEvent(QMouseEvent *);
+               void keyPressEvent(QKeyEvent *);
+               void keyReleaseEvent(QKeyEvent *);
 
        private:
                void CreateCursors(void);
-               QPoint GetAdjustedMousePosition(QMouseEvent * event);
+               QPoint GetAdjustedMousePosition(QMouseEvent *);
                QPoint GetAdjustedClientPosition(int x, int y);
                void DrawGlyph(QPainter & p, GlyphPoints & glyph);
+               void DrawGlyphPoly(QPainter & p, GlyphPoints & glyph, uint16_t poly);
 
        public:
                QImage image;
                QPoint pt, ptOffset, ptPrevious;
                double scale;                                                   // Window scaling factor
-               int32 offsetX, offsetY;                                 // Window offsets
+               int32_t offsetX, offsetY;                                       // Window offsets
                ToolType tool;                                                  // Current tool
                GlyphPoints pts;                                                // Glyph point structure
-               int32 ptHighlight, oldPtHighlight, ptNextHighlight, oldPtNextHighlight;
+               int32_t ptHighlight, oldPtHighlight, ptNextHighlight, oldPtNextHighlight;
+               int16_t polyHighlight, oldPolyHighlight;
                bool polyFirstPoint;
                bool showRotationCenter, haveZeroPoint;
                QPoint rotationCenter, rotationZeroPoint, rotationCurrentPoint;
                double rotationAngle;
 
                ToolWindow * toolPalette;
-               QCursor cur[10];
+               QCursor cur[11];
 };
 
 #endif // __EDITWINDOW_H__