X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/2636ba3c03560d9ba6fa0c6c81205ab489826cc4..08f93a673d519de4cb6ecc35b151f674366fbb3d:/src/tooltips/ktooltipwindow.cpp diff --git a/src/tooltips/ktooltipwindow.cpp b/src/tooltips/ktooltipwindow.cpp index 7c9e0b2f0..035e141eb 100644 --- a/src/tooltips/ktooltipwindow.cpp +++ b/src/tooltips/ktooltipwindow.cpp @@ -22,14 +22,11 @@ #include "ktooltipwindow_p.h" #include +#include #include #include -#ifdef Q_WS_X11 - #include -#endif - KToolTipWindow::KToolTipWindow(QWidget* content) : QWidget(0) { @@ -53,11 +50,7 @@ void KToolTipWindow::paintEvent(QPaintEvent* event) QColor toColor = palette().brush(QPalette::ToolTipBase).color(); QColor fromColor = KColorScheme::shade(toColor, KColorScheme::LightShade, 0.2); -#ifdef Q_WS_X11 - const bool haveAlphaChannel = QX11Info::isCompositingManagerRunning(); -#else - const bool haveAlphaChannel = false; -#endif + const bool haveAlphaChannel = KWindowSystem::compositingActive(); if (haveAlphaChannel) { painter.setRenderHint(QPainter::Antialiasing); painter.translate(0.5, 0.5); @@ -72,17 +65,21 @@ void KToolTipWindow::paintEvent(QPaintEvent* event) painter.setBrush(gradient); const QRect rect(0, 0, width(), height()); - const qreal radius = 5; - - QPainterPath path; - path.moveTo(rect.left(), rect.top() + radius); - arc(path, rect.left() + radius, rect.top() + radius, radius, 180, -90); - arc(path, rect.right() - radius, rect.top() + radius, radius, 90, -90); - arc(path, rect.right() - radius, rect.bottom() - radius, radius, 0, -90); - arc(path, rect.left() + radius, rect.bottom() - radius, radius, 270, -90); - path.closeSubpath(); - - painter.drawPath(path); + if (haveAlphaChannel) { + const qreal radius = 5.0; + + QPainterPath path; + path.moveTo(rect.left(), rect.top() + radius); + arc(path, rect.left() + radius, rect.top() + radius, radius, 180, -90); + arc(path, rect.right() - radius, rect.top() + radius, radius, 90, -90); + arc(path, rect.right() - radius, rect.bottom() - radius, radius, 0, -90); + arc(path, rect.left() + radius, rect.bottom() - radius, radius, 270, -90); + path.closeSubpath(); + + painter.drawPath(path); + } else { + painter.drawRect(rect); + } } void KToolTipWindow::arc(QPainterPath& path, qreal cx, qreal cy, qreal radius, qreal angle, qreal sweeplength)