diff options
Diffstat (limited to 'src/mplayerwindow.h')
| -rw-r--r-- | src/mplayerwindow.h | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/src/mplayerwindow.h b/src/mplayerwindow.h index 793176a..199b0e4 100644 --- a/src/mplayerwindow.h +++ b/src/mplayerwindow.h @@ -41,7 +41,6 @@ class QTimer; #define ZOOM_MIN 0.5 #define DELAYED_RESIZE 0 -#define NEW_MOUSE_CHECK_POS 1 //! Screen is a widget that hides the mouse cursor after some seconds if not moved. @@ -53,13 +52,11 @@ public: Screen(QWidget* parent = 0, Qt::WindowFlags f = 0); ~Screen(); -#if NEW_MOUSE_CHECK_POS void setAutoHideCursor(bool b); bool autoHideCursor() { return autohide_cursor; }; void setAutoHideInterval(int milliseconds) { autohide_interval = milliseconds; }; int autoHideInterval() { return autohide_interval; }; -#endif public slots: //! Should be called when a file has started. @@ -69,9 +66,7 @@ public slots: virtual void playingStopped(); protected: -#if !NEW_MOUSE_CHECK_POS virtual void mouseMoveEvent( QMouseEvent * e ); -#endif virtual void paintEvent ( QPaintEvent * e ); protected slots: @@ -79,13 +74,9 @@ protected slots: private: QTimer * check_mouse_timer; -#if NEW_MOUSE_CHECK_POS QPoint mouse_last_position; bool autohide_cursor; int autohide_interval; -#else - QPoint cursor_pos, last_cursor_pos; -#endif }; //! MplayerLayer can be instructed to not delete the background. @@ -163,11 +154,19 @@ public: virtual bool eventFilter( QObject * watched, QEvent * event ); +#if LOGO_ANIMATION + bool animatedLogo() { return animated_logo; } +#endif + public slots: void setLogoVisible(bool b); void showLogo() { setLogoVisible(true); }; void hideLogo() { setLogoVisible(false); }; +#if LOGO_ANIMATION + void setAnimatedLogo(bool b) { animated_logo = b; }; +#endif + void moveLeft(); void moveRight(); void moveUp(); @@ -202,6 +201,7 @@ signals: void wheelUp(); void wheelDown(); void mouseMoved(QPoint); + void mouseMovedDiff(QPoint); protected: int video_width, video_height; @@ -221,10 +221,15 @@ protected: int orig_width, orig_height; bool allow_video_movement; + QPoint mouse_press_pos; #if DELAYED_RESIZE QTimer * resize_timer; #endif + +#if LOGO_ANIMATION + bool animated_logo; +#endif }; |