diff options
| author | Mateusz Łukasik <mati75@linuxmint.pl> | 2015-04-26 20:41:29 +0200 |
|---|---|---|
| committer | Mateusz Łukasik <mati75@linuxmint.pl> | 2015-04-26 20:41:29 +0200 |
| commit | 6027a8ff2d6ae4eba912427c30c58208009c1ebc (patch) | |
| tree | 756eddd2fc9e7a9943b43e6ff3f9e92cbd4c3352 /src/mplayerwindow.cpp | |
| parent | 45ee5ac6dc2159352596ce8e8ec744e0c864d492 (diff) | |
Imported Upstream version 14.9.0.6887~ds0
Diffstat (limited to 'src/mplayerwindow.cpp')
| -rw-r--r-- | src/mplayerwindow.cpp | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/src/mplayerwindow.cpp b/src/mplayerwindow.cpp index e803dac..06e5c88 100644 --- a/src/mplayerwindow.cpp +++ b/src/mplayerwindow.cpp @@ -129,7 +129,7 @@ MplayerLayer::MplayerLayer(QWidget* parent, Qt::WindowFlags f) setAttribute(Qt::WA_NativeWindow); #endif setAttribute(Qt::WA_PaintUnclipped); - setAttribute(Qt::WA_PaintOnScreen); + //setAttribute(Qt::WA_PaintOnScreen); #endif #endif } @@ -160,9 +160,7 @@ void MplayerLayer::playingStarted() { playing = true; #ifndef Q_OS_WIN - #if QT_VERSION >= 0x050000 setAttribute(Qt::WA_PaintOnScreen); - #endif #endif Screen::playingStarted(); @@ -173,9 +171,7 @@ void MplayerLayer::playingStopped() { playing = false; #ifndef Q_OS_WIN - #if QT_VERSION >= 0x050000 setAttribute(Qt::WA_PaintOnScreen, false); - #endif #endif repaint(); @@ -209,6 +205,7 @@ MplayerWindow::MplayerWindow(QWidget* parent, Qt::WindowFlags f) #if LOGO_ANIMATION , animated_logo(false) #endif + , corner_widget(0) , mouse_drag_tracking(false) , isMoving(false) , startDrag(QPoint(0,0)) @@ -253,6 +250,18 @@ MplayerWindow::MplayerWindow(QWidget* parent, Qt::WindowFlags f) MplayerWindow::~MplayerWindow() { } +void MplayerWindow::setCornerWidget(QWidget * w) { + corner_widget = w; + + QHBoxLayout * blayout = new QHBoxLayout; + blayout->addSpacerItem(new QSpacerItem(20, 20, QSizePolicy::Expanding)); + blayout->addWidget(corner_widget); + + QVBoxLayout * layout = new QVBoxLayout(this); + layout->addSpacerItem(new QSpacerItem(20, 20, QSizePolicy::Expanding, QSizePolicy::Expanding)); + layout->addLayout(blayout); +} + #if USE_COLORKEY void MplayerWindow::setColorKey( QColor c ) { ColorUtils::setBackgroundColor( mplayerlayer, c ); @@ -267,6 +276,10 @@ void MplayerWindow::retranslateStrings() { } void MplayerWindow::setLogoVisible( bool b) { + if (corner_widget) { + corner_widget->setVisible(b); + } + #if !LOGO_ANIMATION logo->setVisible(b); #else |