746fc49bb6
Summary:
This reverts commit 14d1fdf63f
.
The zoom effect is definitely the wrong way, it's broken (can be
triggered without moving the mouse, expands windows outside of their
allotted area (looks like broken sizing/placement), isn't animated so
feels very choppy, isn't using well-known highlight semantics), the
result is that it feels unnatural and jarring. To be honest, when I
looked at it, I was looking for a bug in the code, e.g. margins not
being taken into account. It didn't come up in me that this could be
wanted behavior, until I read the code.
As to the original commit message: The highlight is useless for this
case, as any window can be dragged or activated, highlighted or not.
What *could* work is to somehow intensify the colors, but that again
would have to be animated, and play well with the ongoing desktop-zoom
animation, the mouse pointer location changes relative to the window, so
it's really complex to get right. I thought of this for a while, I don't
think the complexity that has to be implemented is worth the benefit,
because, what does highlighted really mean here? "window is under the
mouse" isn't a useful metric, as we don't know if the user is changing
desktops or rearranging windows, and "window under mouse" changes
depending on the zoom level, "window can be dragged or activated" also
isn't a useful metric, as I can do that with any window, anyway.
Test Plan: Tested with patch applied, desktopgrid windows don't jump around anymore.
Reviewers: graesslin
Reviewed By: graesslin
Subscribers: plasma-devel
Projects: #plasma
Differential Revision: https://phabricator.kde.org/D1209
190 lines
6 KiB
C++
190 lines
6 KiB
C++
/********************************************************************
|
|
KWin - the KDE window manager
|
|
This file is part of the KDE project.
|
|
|
|
Copyright (C) 2007 Lubos Lunak <l.lunak@kde.org>
|
|
Copyright (C) 2008 Lucas Murray <lmurray@undefinedfire.com>
|
|
|
|
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 <http://www.gnu.org/licenses/>.
|
|
*********************************************************************/
|
|
|
|
#ifndef KWIN_DESKTOPGRID_H
|
|
#define KWIN_DESKTOPGRID_H
|
|
|
|
#include <kwineffects.h>
|
|
#include <QObject>
|
|
#include <QTimeLine>
|
|
#include <QQuickView>
|
|
|
|
namespace KWin
|
|
{
|
|
|
|
class PresentWindowsEffectProxy;
|
|
|
|
class DesktopButtonsView : public QQuickView
|
|
{
|
|
Q_OBJECT
|
|
public:
|
|
explicit DesktopButtonsView(QWindow *parent = 0);
|
|
void windowInputMouseEvent(QMouseEvent* e);
|
|
void setAddDesktopEnabled(bool enable);
|
|
void setRemoveDesktopEnabled(bool enable);
|
|
bool isVisible() const;
|
|
void show();
|
|
void hide();
|
|
public:
|
|
EffectWindow *effectWindow;
|
|
Q_SIGNALS:
|
|
void addDesktop();
|
|
void removeDesktop();
|
|
private:
|
|
bool m_visible;
|
|
QPoint m_pos;
|
|
bool m_posIsValid;
|
|
};
|
|
|
|
class DesktopGridEffect
|
|
: public Effect
|
|
{
|
|
Q_OBJECT
|
|
Q_PROPERTY(int zoomDuration READ configuredZoomDuration)
|
|
Q_PROPERTY(int border READ configuredBorder)
|
|
Q_PROPERTY(Qt::Alignment desktopNameAlignment READ configuredDesktopNameAlignment)
|
|
Q_PROPERTY(int layoutMode READ configuredLayoutMode)
|
|
Q_PROPERTY(int customLayoutRows READ configuredCustomLayoutRows)
|
|
Q_PROPERTY(bool usePresentWindows READ isUsePresentWindows)
|
|
// TODO: electric borders
|
|
public:
|
|
DesktopGridEffect();
|
|
~DesktopGridEffect();
|
|
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 void windowInputMouseEvent(QEvent* e);
|
|
virtual void grabbedKeyboardEvent(QKeyEvent* e);
|
|
virtual bool borderActivated(ElectricBorder border);
|
|
virtual bool isActive() const;
|
|
|
|
int requestedEffectChainPosition() const override {
|
|
return 50;
|
|
}
|
|
|
|
enum { LayoutPager, LayoutAutomatic, LayoutCustom }; // Layout modes
|
|
|
|
// for properties
|
|
int configuredZoomDuration() const {
|
|
return zoomDuration;
|
|
}
|
|
int configuredBorder() const {
|
|
return border;
|
|
}
|
|
Qt::Alignment configuredDesktopNameAlignment() const {
|
|
return desktopNameAlignment;
|
|
}
|
|
int configuredLayoutMode() const {
|
|
return layoutMode;
|
|
}
|
|
int configuredCustomLayoutRows() const {
|
|
return customLayoutRows;
|
|
}
|
|
bool isUsePresentWindows() const {
|
|
return m_usePresentWindows;
|
|
}
|
|
private Q_SLOTS:
|
|
void toggle();
|
|
// slots for global shortcut changed
|
|
// needed to toggle the effect
|
|
void globalShortcutChanged(QAction *action, const QKeySequence& seq);
|
|
void slotAddDesktop();
|
|
void slotRemoveDesktop();
|
|
void slotWindowAdded(KWin::EffectWindow* w);
|
|
void slotWindowClosed(KWin::EffectWindow *w);
|
|
void slotWindowDeleted(KWin::EffectWindow *w);
|
|
void slotNumberDesktopsChanged(uint old);
|
|
void slotWindowGeometryShapeChanged(KWin::EffectWindow *w, const QRect &old);
|
|
|
|
private:
|
|
QPointF scalePos(const QPoint& pos, int desktop, int screen = -1) const;
|
|
QPoint unscalePos(const QPoint& pos, int* desktop = NULL) const;
|
|
int posToDesktop(const QPoint& pos) const;
|
|
EffectWindow* windowAt(QPoint pos) const;
|
|
void setCurrentDesktop(int desktop);
|
|
void setHighlightedDesktop(int desktop);
|
|
int desktopToRight(int desktop, bool wrap = true) const;
|
|
int desktopToLeft(int desktop, bool wrap = true) const;
|
|
int desktopUp(int desktop, bool wrap = true) const;
|
|
int desktopDown(int desktop, bool wrap = true) const;
|
|
void setActive(bool active);
|
|
void setup();
|
|
void setupGrid();
|
|
void finish();
|
|
bool isMotionManagerMovingWindows() const;
|
|
bool isRelevantWithPresentWindows(EffectWindow *w) const;
|
|
bool isUsingPresentWindows() const;
|
|
QRectF moveGeometryToDesktop(int desktop) const;
|
|
void desktopsAdded(int old);
|
|
void desktopsRemoved(int old);
|
|
QVector<int> desktopList(const EffectWindow *w) const;
|
|
|
|
QList<ElectricBorder> borderActivate;
|
|
int zoomDuration;
|
|
int border;
|
|
Qt::Alignment desktopNameAlignment;
|
|
int layoutMode;
|
|
int customLayoutRows;
|
|
|
|
bool activated;
|
|
QTimeLine timeline;
|
|
int paintingDesktop;
|
|
int highlightedDesktop;
|
|
int m_originalMovingDesktop;
|
|
bool keyboardGrab;
|
|
bool wasWindowMove, wasDesktopMove, isValidMove;
|
|
EffectWindow* windowMove;
|
|
QPoint windowMoveDiff;
|
|
QPoint dragStartPos;
|
|
|
|
// Soft highlighting
|
|
QList<QTimeLine*> hoverTimeline;
|
|
|
|
QList< EffectFrame* > desktopNames;
|
|
|
|
QSize gridSize;
|
|
Qt::Orientation orientation;
|
|
QPoint activeCell;
|
|
// Per screen variables
|
|
QList<double> scale; // Because the border isn't a ratio each screen is different
|
|
QList<double> unscaledBorder;
|
|
QList<QSizeF> scaledSize;
|
|
QList<QPointF> scaledOffset;
|
|
|
|
// Shortcut - needed to toggle the effect
|
|
QList<QKeySequence> shortcut;
|
|
|
|
PresentWindowsEffectProxy* m_proxy;
|
|
QList<WindowMotionManager> m_managers;
|
|
bool m_usePresentWindows;
|
|
QRect m_windowMoveGeometry;
|
|
QPoint m_windowMoveStartPoint;
|
|
|
|
QVector<DesktopButtonsView*> m_desktopButtonsViews;
|
|
|
|
};
|
|
|
|
} // namespace
|
|
|
|
#endif
|