Merge branch 'emulator' of github.com:t-moe/discoverpixy into emulator

2015-04-27 18:43:08 +02:00
parent aed90ef956 259d446888
commit 7be246ac3c
29 changed files with 413 additions and 113 deletions
--- a/emulator/qt/mainwindow.h
+++ b/emulator/qt/mainwindow.h
@@ -26,11 +26,15 @@ public:

 protected:
     void paintEvent(QPaintEvent * evt);
+     void mousePressEvent(QMouseEvent* evt);
+     void mouseReleaseEvent(QMouseEvent* evt);
+     void mouseMoveEvent(QMouseEvent* evt);
    ~MainWindow();

 private:
    //QMutex render_mutex;
    QImage image;
+    void checkAndSendEvent(QPoint pos, bool down);

    Ui::MainWindow *ui;