Funkwhale
/
Clementine-audio-player-Mac-Linux-Windows
mirror of https://github.com/clementine-player/Clementine
1
0
Fork 0
Code Issues Releases Wiki Activity

If the pretty OSD is positioned against the right/bottom edge, always display it there regardless of the size.

This commit is contained in:
David Sansome 2010-04-19 13:16:53 +00:00
parent e014b67090
commit 1dc8cca6e1
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/osdpretty.cpp
View File

@ -246,17 +246,24 @@ void OSDPretty::FaderValueChanged(qreal value) {
void OSDPretty::Reposition() {
QDesktopWidget* desktop = QApplication::desktop();
// Make the OSD the proper size
layout()->activate();
resize(sizeHint());
// Work out where to place the OSD. -1 for x or y means "on the right or
// bottom edge".
QRect geometry(desktop->availableGeometry(popup_display_));
int x = popup_pos_.x() + geometry.left();
int y = popup_pos_.y() + geometry.top();
int x = popup_pos_.x() < 0 ? geometry.right() - width()
: geometry.left() + popup_pos_.x();
int y = popup_pos_.y() < 0 ? geometry.bottom() - height()
: geometry.top() + popup_pos_.y();
move(qBound(0, x, geometry.right() - width()),
qBound(0, y, geometry.bottom() - height()));
// If there's no compositing window manager running then we have to set an
// XShape mask.
if (IsTransparencyAvailable())
clearMask();
else {
@ -313,8 +320,12 @@ QPoint OSDPretty::current_pos() const {
QDesktopWidget* desktop = QApplication::desktop();
QRect geometry(desktop->availableGeometry(current_display()));
return QPoint(pos().x() - geometry.left(),
pos().y() - geometry.top());
int x = pos().x() >= geometry.right() - width()
? -1 : pos().x() - geometry.left();
int y = pos().y() >= geometry.bottom() - height()
? -1 : pos().y() - geometry.top();
return QPoint(x, y);
}
int OSDPretty::current_display() const {