dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make OSDPretty compatible with Qt 6

Browse Source
This commit is contained in:
Jonas Kvinge
2020-07-18 04:15:19 +02:00
parent c96c29b1e3
commit a101252701
1 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/widgets/osdpretty.cpp
View File

@@ -146,8 +146,12 @@ OSDPretty::OSDPretty(Mode mode, QWidget *parent)
// Set the margins to allow for the drop shadow // Set the margins to allow for the drop shadow
QBoxLayout *l = qobject_cast<QBoxLayout*>(layout()); QBoxLayout *l = qobject_cast<QBoxLayout*>(layout());
int margin = l->margin() + kDropShadowSize; QMargins margin = l->contentsMargins() + kDropShadowSize;
l->setMargin(margin); margin.setTop(margin.top() + kDropShadowSize);
margin.setBottom(margin.bottom() + kDropShadowSize);
margin.setLeft(margin.left() + kDropShadowSize);
margin.setRight(margin.right() + kDropShadowSize);
l->setContentsMargins(margin);
connect(qApp, SIGNAL(screenAdded(QScreen*)), this, SLOT(ScreenAdded(QScreen*))); connect(qApp, SIGNAL(screenAdded(QScreen*)), this, SLOT(ScreenAdded(QScreen*)));
connect(qApp, SIGNAL(screenRemoved(QScreen*)), this, SLOT(ScreenRemoved(QScreen*))); connect(qApp, SIGNAL(screenRemoved(QScreen*)), this, SLOT(ScreenRemoved(QScreen*)));
@@ -210,7 +214,7 @@ void OSDPretty::ScreenRemoved(QScreen *screen) {
} }
bool OSDPretty::IsTransparencyAvailable() { bool OSDPretty::IsTransparencyAvailable() {
#if defined(HAVE_X11) && (QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)) #if defined(HAVE_X11)
return QX11Info::isCompositingManagerRunning(); return QX11Info::isCompositingManagerRunning();
#endif #endif
return true; return true;
@@ -277,7 +281,6 @@ void OSDPretty::paintEvent(QPaintEvent *) {
QPainter p(this); QPainter p(this);
p.setRenderHint(QPainter::Antialiasing); p.setRenderHint(QPainter::Antialiasing);
p.setRenderHint(QPainter::HighQualityAntialiasing);
QRect box(BoxBorder()); QRect box(BoxBorder());
@@ -451,7 +454,11 @@ void OSDPretty::mousePressEvent(QMouseEvent *e) {
hide(); hide();
else { else {
original_window_pos_ = pos(); original_window_pos_ = pos();
#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
drag_start_pos_ = e->globalPosition().toPoint();
#else
drag_start_pos_ = e->globalPos(); drag_start_pos_ = e->globalPos();
#endif
} }
} }
@@ -459,11 +466,19 @@ void OSDPretty::mousePressEvent(QMouseEvent *e) {
void OSDPretty::mouseMoveEvent(QMouseEvent *e) { void OSDPretty::mouseMoveEvent(QMouseEvent *e) {
if (mode_ == Mode_Draggable) { if (mode_ == Mode_Draggable) {
#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
QPoint delta = e->globalPosition().toPoint() - drag_start_pos_;
#else
QPoint delta = e->globalPos() - drag_start_pos_; QPoint delta = e->globalPos() - drag_start_pos_;
#endif
QPoint new_pos = original_window_pos_ + delta; QPoint new_pos = original_window_pos_ + delta;
// Keep it to the bounds of the desktop // Keep it to the bounds of the desktop
#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
QScreen *screen = current_screen(e->globalPosition().toPoint());
#else
QScreen *screen = current_screen(e->globalPos()); QScreen *screen = current_screen(e->globalPos());
#endif
if (!screen) return; if (!screen) return;
QRect geometry = screen->availableGeometry(); QRect geometry = screen->availableGeometry();