diff --git a/effects/slide/slide.cpp b/effects/slide/slide.cpp index 694517eb0..dec7499e0 100644 --- a/effects/slide/slide.cpp +++ b/effects/slide/slide.cpp @@ -1,237 +1,262 @@ /******************************************************************** KWin - the KDE window manager This file is part of the KDE project. Copyright (C) 2007 Lubos Lunak Copyright (C) 2008 Lucas Murray This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . *********************************************************************/ #include "slide.h" #include namespace KWin { KWIN_EFFECT(slide, SlideEffect) SlideEffect::SlideEffect() : slide(false) { connect(effects, SIGNAL(desktopChanged(int,int)), this, SLOT(slotDesktopChanged(int,int))); mTimeLine.setCurveShape(QTimeLine::EaseInOutCurve); reconfigure(ReconfigureAll); } void SlideEffect::reconfigure(ReconfigureFlags) { mTimeLine.setDuration(animationTime(250)); } void SlideEffect::prePaintScreen(ScreenPrePaintData& data, int time) { if (slide) { mTimeLine.setCurrentTime(mTimeLine.currentTime() + time); // PAINT_SCREEN_BACKGROUND_FIRST is needed because screen will be actually painted more than once, // so with normal screen painting second screen paint would erase parts of the first paint if (mTimeLine.currentValue() != 1) data.mask |= PAINT_SCREEN_TRANSFORMED | PAINT_SCREEN_BACKGROUND_FIRST; else { slide = false; mTimeLine.setCurrentTime(0); + foreach (EffectWindow * w, effects->stackingOrder()) { + w->setData(WindowForceBlurRole, QVariant(false)); + } effects->setActiveFullScreenEffect(NULL); } } effects->prePaintScreen(data, time); } void SlideEffect::prePaintWindow(EffectWindow* w, WindowPrePaintData& data, int time) { if (slide) { if (w->isOnAllDesktops()) { - if (!slide_painting_sticky) + bool keep_above = w->keepAbove() || w->isDock(); + if ((!slide_painting_sticky || keep_above) && + (!keep_above || !slide_painting_keep_above)) { w->disablePainting(EffectWindow::PAINT_DISABLED_BY_DESKTOP); + } } else if (w->isOnDesktop(painting_desktop)) { data.setTransformed(); w->enablePainting(EffectWindow::PAINT_DISABLED_BY_DESKTOP); } else { w->disablePainting(EffectWindow::PAINT_DISABLED_BY_DESKTOP); } } effects->prePaintWindow(w, data, time); } void SlideEffect::paintScreen(int mask, QRegion region, ScreenPaintData& data) { if (mTimeLine.currentValue() == 0) { effects->paintScreen(mask, region, data); return; } /* Transformations are done by remembering starting position of the change and the progress of it, the destination is computed from the current desktop. Positions of desktops are done using their topleft corner. */ QPoint destPos = desktopRect(effects->currentDesktop()).topLeft(); QPoint diffPos = destPos - slide_start_pos; int w = 0; int h = 0; if (effects->optionRollOverDesktops()) { w = effects->workspaceWidth(); h = effects->workspaceHeight(); // wrap around if shorter if (diffPos.x() > 0 && diffPos.x() > w / 2) diffPos.setX(diffPos.x() - w); if (diffPos.x() < 0 && abs(diffPos.x()) > w / 2) diffPos.setX(diffPos.x() + w); if (diffPos.y() > 0 && diffPos.y() > h / 2) diffPos.setY(diffPos.y() - h); if (diffPos.y() < 0 && abs(diffPos.y()) > h / 2) diffPos.setY(diffPos.y() + h); } QPoint currentPos = slide_start_pos + mTimeLine.currentValue() * diffPos; QSize displaySize(displayWidth(), displayHeight()); QRegion currentRegion = QRect(currentPos, displaySize); if (effects->optionRollOverDesktops()) { currentRegion |= (currentRegion & QRect(-w, 0, w, h)).translated(w, 0); currentRegion |= (currentRegion & QRect(0, -h, w, h)).translated(0, h); currentRegion |= (currentRegion & QRect(w, 0, w, h)).translated(-w, 0); currentRegion |= (currentRegion & QRect(0, h, w, h)).translated(0, -h); } bool do_sticky = true; + // Assure that the windows that are on all desktops and always on top + // are painted with the last screen (e.g. plasma's tooltips). All other windows + // that are on all desktops (e.g. the background window) are painted together + // with the first screen. + int last_desktop = 0; + QList desktop_rects; for (int desktop = 1; desktop <= effects->numberOfDesktops(); ++desktop) { QRect rect = desktopRect(desktop); + desktop_rects << rect; + if (currentRegion.contains(rect)) { + last_desktop = desktop; + } + } + for (int desktop = 1; + desktop <= effects->numberOfDesktops(); + ++desktop) { + QRect rect = desktop_rects[desktop-1]; if (currentRegion.contains(rect)) { // part of the desktop needs painting painting_desktop = desktop; slide_painting_sticky = do_sticky; + slide_painting_keep_above = (last_desktop == desktop); slide_painting_diff = rect.topLeft() - currentPos; if (effects->optionRollOverDesktops()) { if (slide_painting_diff.x() > displayWidth()) slide_painting_diff.setX(slide_painting_diff.x() - w); if (slide_painting_diff.x() < -displayWidth()) slide_painting_diff.setX(slide_painting_diff.x() + w); if (slide_painting_diff.y() > displayHeight()) slide_painting_diff.setY(slide_painting_diff.y() - h); if (slide_painting_diff.y() < -displayHeight()) slide_painting_diff.setY(slide_painting_diff.y() + h); } do_sticky = false; // paint on-all-desktop windows only once // TODO mask parts that are not visible? effects->paintScreen(mask, region, data); } } } void SlideEffect::paintWindow(EffectWindow* w, int mask, QRegion region, WindowPaintData& data) { if (slide) { // don't move windows on all desktops (compensate screen transformation) if (!w->isOnAllDesktops()) { // TODO also fix 'Workspace::movingClient' data.xTranslate += slide_painting_diff.x(); data.yTranslate += slide_painting_diff.y(); } } effects->paintWindow(w, mask, region, data); } void SlideEffect::postPaintScreen() { if (slide) effects->addRepaintFull(); effects->postPaintScreen(); } // Gives a position of the given desktop when all desktops are arranged in a grid QRect SlideEffect::desktopRect(int desktop) const { QRect rect(0, 0, displayWidth(), displayHeight()); rect.translate(effects->desktopCoords(desktop)); return rect; } void SlideEffect::slotDesktopChanged(int old, int current) { if (effects->activeFullScreenEffect() && effects->activeFullScreenEffect() != this) return; if (slide) { // old slide still in progress QPoint diffPos = desktopRect(old).topLeft() - slide_start_pos; int w = 0; int h = 0; if (effects->optionRollOverDesktops()) { w = effects->workspaceWidth(); h = effects->workspaceHeight(); // wrap around if shorter if (diffPos.x() > 0 && diffPos.x() > w / 2) diffPos.setX(diffPos.x() - w); if (diffPos.x() < 0 && abs(diffPos.x()) > w / 2) diffPos.setX(diffPos.x() + w); if (diffPos.y() > 0 && diffPos.y() > h / 2) diffPos.setY(diffPos.y() - h); if (diffPos.y() < 0 && abs(diffPos.y()) > h / 2) diffPos.setY(diffPos.y() + h); } QPoint currentPos = slide_start_pos + mTimeLine.currentValue() * diffPos; QRegion currentRegion = QRect(currentPos, QSize(displayWidth(), displayHeight())); if (effects->optionRollOverDesktops()) { currentRegion |= (currentRegion & QRect(-w, 0, w, h)).translated(w, 0); currentRegion |= (currentRegion & QRect(0, -h, w, h)).translated(0, h); currentRegion |= (currentRegion & QRect(w, 0, w, h)).translated(-w, 0); currentRegion |= (currentRegion & QRect(0, h, w, h)).translated(0, -h); } QRect rect = desktopRect(current); if (currentRegion.contains(rect)) { // current position is in new current desktop (e.g. quickly changing back), // don't do full progress if (abs(currentPos.x() - rect.x()) > abs(currentPos.y() - rect.y())) mTimeLine.setCurrentTime((1.0 - abs(currentPos.x() - rect.x()) / double(displayWidth()))*(qreal)mTimeLine.currentValue()); else mTimeLine.setCurrentTime((1.0 - abs(currentPos.y() - rect.y()) / double(displayHeight()))*(qreal)mTimeLine.currentValue()); } else // current position is not on current desktop, do full progress mTimeLine.setCurrentTime(0); diffPos = rect.topLeft() - currentPos; if (mTimeLine.currentValue() <= 0) { // Compute starting point for this new move (given current and end positions) slide_start_pos = rect.topLeft() - diffPos * 1 / (1 - mTimeLine.currentValue()); } else { // at the end, stop slide = false; mTimeLine.setCurrentTime(0); effects->setActiveFullScreenEffect(NULL); } } else { if (effects->activeFullScreenEffect() && effects->activeFullScreenEffect() != this) return; mTimeLine.setCurrentTime(0); slide_start_pos = desktopRect(old).topLeft(); slide = true; + foreach (EffectWindow * w, effects->stackingOrder()) { + w->setData(WindowForceBlurRole, QVariant(true)); + } effects->setActiveFullScreenEffect(this); } effects->addRepaintFull(); } bool SlideEffect::isActive() const { return slide; } } // namespace #include "slide.moc" diff --git a/effects/slide/slide.h b/effects/slide/slide.h index 8c91ad4fe..419e840c9 100644 --- a/effects/slide/slide.h +++ b/effects/slide/slide.h @@ -1,62 +1,63 @@ /******************************************************************** KWin - the KDE window manager This file is part of the KDE project. Copyright (C) 2007 Lubos Lunak Copyright (C) 2008 Lucas Murray This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . *********************************************************************/ #ifndef KWIN_SLIDE_H #define KWIN_SLIDE_H #include #include #include namespace KWin { class SlideEffect : public Effect { Q_OBJECT public: SlideEffect(); virtual void reconfigure(ReconfigureFlags); virtual void prePaintScreen(ScreenPrePaintData& data, int time); virtual void paintScreen(int mask, QRegion region, ScreenPaintData& data); virtual void postPaintScreen(); virtual void prePaintWindow(EffectWindow* w, WindowPrePaintData& data, int time); virtual void paintWindow(EffectWindow* w, int mask, QRegion region, WindowPaintData& data); virtual bool isActive() const; private Q_SLOTS: void slotDesktopChanged(int old, int current); private: QRect desktopRect(int desktop) const; QTimeLine mTimeLine; int painting_desktop; bool slide; QPoint slide_start_pos; bool slide_painting_sticky; + bool slide_painting_keep_above; QPoint slide_painting_diff; }; } // namespace #endif