1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bradient: Activate the decoration's buttons on mouse release, not press

Browse Source 
Change-Id: I5a161119b20301a405bdde9bbea6bfbdcc4b9fa0
Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
This commit is contained in:
Giulio Camuffo 2015-04-24 20:51:14 +03:00
parent 9369a931d0
commit 58f3c602f0
1 changed files with 36 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/plugins/platforms/wayland/plugins/decorations/bradient/main.cpp
View File

@ -116,6 +116,14 @@ static const char * const qt_normalizeup_xpm[] = {
# define BUTTON_WIDTH 22 # define BUTTON_WIDTH 22
#endif #endif
enum Button
{
None,
Close,
Maximize,
Minimize
};
class Q_WAYLAND_CLIENT_EXPORT QWaylandBradientDecoration : public QWaylandAbstractDecoration class Q_WAYLAND_CLIENT_EXPORT QWaylandBradientDecoration : public QWaylandAbstractDecoration
{ {
public: public:
@ -130,6 +138,7 @@ private:
void processMouseBottom(QWaylandInputDevice *inputDevice, const QPointF &local, Qt::MouseButtons b,Qt::KeyboardModifiers mods); void processMouseBottom(QWaylandInputDevice *inputDevice, const QPointF &local, Qt::MouseButtons b,Qt::KeyboardModifiers mods);
void processMouseLeft(QWaylandInputDevice *inputDevice, const QPointF &local, Qt::MouseButtons b,Qt::KeyboardModifiers mods); void processMouseLeft(QWaylandInputDevice *inputDevice, const QPointF &local, Qt::MouseButtons b,Qt::KeyboardModifiers mods);
void processMouseRight(QWaylandInputDevice *inputDevice, const QPointF &local, Qt::MouseButtons b,Qt::KeyboardModifiers mods); void processMouseRight(QWaylandInputDevice *inputDevice, const QPointF &local, Qt::MouseButtons b,Qt::KeyboardModifiers mods);
bool clickButton(Qt::MouseButtons b, Button btn);
QRectF closeButtonRect() const; QRectF closeButtonRect() const;
QRectF maximizeButtonRect() const; QRectF maximizeButtonRect() const;
@ -138,12 +147,14 @@ private:
QColor m_foregroundColor; QColor m_foregroundColor;
QColor m_backgroundColor; QColor m_backgroundColor;
QStaticText m_windowTitle; QStaticText m_windowTitle;
Button m_clicking;
}; };
QWaylandBradientDecoration::QWaylandBradientDecoration() QWaylandBradientDecoration::QWaylandBradientDecoration()
: QWaylandAbstractDecoration() : QWaylandAbstractDecoration()
, m_clicking(None)
{ {
QPalette palette; QPalette palette;
m_foregroundColor = palette.color(QPalette::Active, QPalette::HighlightedText); m_foregroundColor = palette.color(QPalette::Active, QPalette::HighlightedText);
@ -315,18 +326,37 @@ void QWaylandBradientDecoration::paint(QPaintDevice *device)
#endif #endif
} }
bool QWaylandBradientDecoration::clickButton(Qt::MouseButtons b, Button btn)
{
if (isLeftClicked(b)) {
m_clicking = btn;
return false;
} else if (isLeftReleased(b)) {
if (m_clicking == btn) {
m_clicking = None;
return true;
} else {
m_clicking = None;
}
}
return false;
}
bool QWaylandBradientDecoration::handleMouse(QWaylandInputDevice *inputDevice, const QPointF &local, const QPointF &global, Qt::MouseButtons b, Qt::KeyboardModifiers mods) bool QWaylandBradientDecoration::handleMouse(QWaylandInputDevice *inputDevice, const QPointF &local, const QPointF &global, Qt::MouseButtons b, Qt::KeyboardModifiers mods)
{ {
Q_UNUSED(global); Q_UNUSED(global);
// Figure out what area mouse is in // Figure out what area mouse is in
if (closeButtonRect().contains(local) && isLeftClicked(b)) { if (closeButtonRect().contains(local)) {
QWindowSystemInterface::handleCloseEvent(window()); if (clickButton(b, Close))
} else if (maximizeButtonRect().contains(local) && isLeftClicked(b)) { QWindowSystemInterface::handleCloseEvent(window());
window()->setWindowState(waylandWindow()->isMaximized() ? Qt::WindowNoState : Qt::WindowMaximized); } else if (maximizeButtonRect().contains(local)) {
} else if (minimizeButtonRect().contains(local) && isLeftClicked(b)) { if (clickButton(b, Maximize))
window()->setWindowState(Qt::WindowMinimized); window()->setWindowState(waylandWindow()->isMaximized() ? Qt::WindowNoState : Qt::WindowMaximized);
} else if (minimizeButtonRect().contains(local)) {
if (clickButton(b, Minimize))
window()->setWindowState(Qt::WindowMinimized);
} else if (local.y() <= margins().top()) { } else if (local.y() <= margins().top()) {
processMouseTop(inputDevice,local,b,mods); processMouseTop(inputDevice,local,b,mods);
} else if (local.y() > window()->height() - margins().bottom() + margins().top()) { } else if (local.y() > window()->height() - margins().bottom() + margins().top()) {