Changeset 163 for smplayer/vendor/current/src/mplayerwindow.h

Timestamp:

May 15, 2014, 7:53:54 PM (11 years ago)

Author:

Silvan Scherrer

Message:

SMPlayer: update vendor to 0.8.7

File:

• smplayer/vendor/current/src/mplayerwindow.h (modified) (9 diffs)

smplayer/vendor/current/src/mplayerwindow.h

@@ -1 +1 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2013 Ricardo Villalba <rvm@users.sourceforge.net>
+    Copyright (C) 2006-2014 Ricardo Villalba <rvm@users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or modify
@@ -66 +66 @@
         virtual void playingStopped();
 
+signals:
+        void mouseMoved(QPoint);
+
 protected:
         virtual void mouseMoveEvent( QMouseEvent * e );
-        virtual void paintEvent ( QPaintEvent * e );
 
 protected slots:
@@ -121 +123 @@
 class MplayerWindow : public Screen
 {
-    Q_OBJECT
+        Q_OBJECT
 
 public:
-    MplayerWindow( QWidget* parent = 0, Qt::WindowFlags f = 0);
-    ~MplayerWindow();
-    
+        MplayerWindow(QWidget* parent = 0, Qt::WindowFlags f = 0);
+        ~MplayerWindow();
+
         MplayerLayer * videoLayer() { return mplayerlayer; };
 
@@ -150 +152 @@
         bool isVideoMovementAllowed() { return allow_video_movement; };
 
+        void delayLeftClick(bool b) { delay_left_click = b; };
+        bool isLeftClickDelayed() { return delay_left_click; };
+
         virtual QSize sizeHint () const;
         virtual QSize minimumSizeHint() const;
 
-        virtual bool eventFilter( QObject * watched, QEvent * event );
+        virtual bool eventFilter(QObject *, QEvent *);
 
 #if LOGO_ANIMATION
@@ -175 +180 @@
         void decZoom();
 
+        void activateMouseDragTracking(bool active) { mouse_drag_tracking = active; }
+
 #if DELAYED_RESIZE
 protected slots:
@@ -184 +191 @@
         virtual void changeEvent ( QEvent * event ) ;
 
-    virtual void resizeEvent( QResizeEvent * e);
-    virtual void mouseReleaseEvent( QMouseEvent * e);
+        virtual void resizeEvent( QResizeEvent * e);
+        virtual void mouseReleaseEvent( QMouseEvent * e);
         virtual void mouseDoubleClickEvent( QMouseEvent * e );
         virtual void wheelEvent( QWheelEvent * e );
@@ -201 +208 @@
         void wheelUp();
         void wheelDown();
-        void mouseMoved(QPoint);
         void mouseMovedDiff(QPoint);
 
 protected:
-    int video_width, video_height;
-    double aspect;
+        int video_width, video_height;
+        double aspect;
         double monitoraspect;
 
@@ -222 +228 @@
 
         bool allow_video_movement;
-        QPoint mouse_press_pos;
 
 #if DELAYED_RESIZE
@@ -228 +233 @@
 #endif
 
+        // Delay left click event
+        bool delay_left_click;
+        QTimer * left_click_timer;
+        bool double_clicked;
+
 #if LOGO_ANIMATION
         bool animated_logo;
 #endif
+
+private:
+        bool mouse_drag_tracking;
+        bool isMoving;
+        QPoint startDrag;
 };
 
-
-#endif
-
+#endif
+