Akatsuki-Misaki/dde-dock
1
0
Fork 0
mirror of https://github.com/linuxdeepin/dde-dock.git synced 2025-06-03 00:15:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

preview support 2D wm

Browse Source 
Change-Id: Ib335d2b5cd37c1828eb9f53136e4d80dead487d1
This commit is contained in:
石博文 2017-05-10 10:44:47 +08:00
parent 0adca06004
commit f7a7df6ae8
Notes: Deepin Code Review 2017-05-10 12:25:52 +08:00 
Verified+1: Anonymous Coward #1000004
Code-Review+2: 石博文 <sbw@sbw.so>
Submitted-by: 石博文 <sbw@sbw.so>
Submitted-at: Wed, 10 May 2017 12:25:40 +0800
Reviewed-on: https://cr.deepin.io/22960
Project: dde/dde-dock
Branch: refs/heads/master
4 changed files with 97 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
frame/item/components/previewcontainer.cpp
View File

@ -8,6 +8,8 @@
PreviewContainer::PreviewContainer(QWidget *parent)
: QWidget(parent),
m_wmHelper(DWindowManagerHelper::instance()),
m_mouseLeaveTimer(new QTimer(this))
{
m_windowListLayout = new QBoxLayout(QBoxLayout::LeftToRight);
@ -70,18 +72,23 @@ void PreviewContainer::setWindowInfos(const WindowDict &infos)
void PreviewContainer::updateLayoutDirection(const Dock::Position dockPos)
{
switch (dockPos)
{
case Dock::Top:
case Dock::Bottom:
if (m_wmHelper->hasComposite() && (dockPos == Dock::Top || dockPos == Dock::Bottom))
m_windowListLayout->setDirection(QBoxLayout::LeftToRight);
break;
case Dock::Left:
case Dock::Right:
else
m_windowListLayout->setDirection(QBoxLayout::TopToBottom);
break;
}
// switch (dockPos)
// {
// case Dock::Top:
// case Dock::Bottom:
// m_windowListLayout->setDirection(QBoxLayout::LeftToRight);
// break;
// case Dock::Left:
// case Dock::Right:
// m_windowListLayout->setDirection(QBoxLayout::TopToBottom);
// break;
// }
}
void PreviewContainer::leaveEvent(QEvent *e)

6
frame/item/components/previewcontainer.h
View File

@ -7,6 +7,10 @@
#include "dbus/dbusdockentry.h"
#include "constants.h"
#include <DWindowManagerHelper>
DWIDGET_USE_NAMESPACE
class PreviewContainer : public QWidget
{
Q_OBJECT
@ -37,6 +41,8 @@ private slots:
private:
QBoxLayout *m_windowListLayout;
DWindowManagerHelper *m_wmHelper;
QTimer *m_mouseLeaveTimer;
QMap<WId, QWidget *> m_windows;

102
frame/item/components/previewwidget.cpp
View File

@ -9,9 +9,10 @@
#include <QTimer>
#include <QVBoxLayout>
#define PREVIEW_W 200
#define PREVIEW_H 130
#define PREVIEW_M 12
#define PREVIEW_W 200
#define PREVIEW_H 130
#define PREVIEW_M 12
#define PREVIEW_MINI_H 30
PreviewWidget::PreviewWidget(const WId wid, QWidget *parent)
: QWidget(parent),
@ -19,7 +20,9 @@ PreviewWidget::PreviewWidget(const WId wid, QWidget *parent)
m_wid(wid),
m_mouseEnterTimer(new QTimer(this)),
m_hovered(false)
m_hovered(false),
m_wmHelper(DWindowManagerHelper::instance())
{
m_closeButton = new DImageButton;
m_closeButton->setFixedSize(24, 24);
@ -35,20 +38,22 @@ PreviewWidget::PreviewWidget(const WId wid, QWidget *parent)
m_mouseEnterTimer->setInterval(200);
m_mouseEnterTimer->setSingleShot(true);
QVBoxLayout *centralLayout = new QVBoxLayout;
centralLayout->setSpacing(0);
centralLayout->setMargin(0);
centralLayout->addWidget(m_closeButton);
centralLayout->setAlignment(m_closeButton, Qt::AlignTop | Qt::AlignRight);
m_centralLayout = new QVBoxLayout;
m_centralLayout->setSpacing(0);
m_centralLayout->setMargin(0);
m_centralLayout->addWidget(m_closeButton);
m_centralLayout->setAlignment(m_closeButton, Qt::AlignTop | Qt::AlignRight);
setFixedSize(PREVIEW_W + PREVIEW_M * 2, PREVIEW_H + PREVIEW_M * 2);
setLayout(centralLayout);
setLayout(m_centralLayout);
setAcceptDrops(true);
connect(m_closeButton, &DImageButton::clicked, this, &PreviewWidget::closeWindow);
connect(m_mouseEnterTimer, &QTimer::timeout, this, &PreviewWidget::showPreview, Qt::QueuedConnection);
connect(m_wmHelper, &DWindowManagerHelper::hasCompositeChanged, this, &PreviewWidget::updatePreviewSize, Qt::QueuedConnection);
QTimer::singleShot(1, this, &PreviewWidget::refreshImage);
QTimer::singleShot(1, this, &PreviewWidget::updatePreviewSize);
}
void PreviewWidget::setTitle(const QString &title)
@ -60,6 +65,9 @@ void PreviewWidget::setTitle(const QString &title)
void PreviewWidget::refreshImage()
{
if (!m_wmHelper->hasComposite())
return;
const auto display = QX11Info::display();
XWindowAttributes attrs;
@ -98,36 +106,60 @@ void PreviewWidget::showPreview()
emit requestPreviewWindow(m_wid);
}
void PreviewWidget::updatePreviewSize()
{
if (m_wmHelper->hasComposite())
{
setFixedHeight(PREVIEW_H + PREVIEW_M * 2);
m_centralLayout->setAlignment(m_closeButton, Qt::AlignTop | Qt::AlignRight);
} else {
setFixedHeight(PREVIEW_MINI_H);
m_centralLayout->setAlignment(m_closeButton, Qt::AlignVCenter | Qt::AlignRight);
}
refreshImage();
}
void PreviewWidget::paintEvent(QPaintEvent *e)
{
const QRect r = rect().marginsRemoved(QMargins(PREVIEW_M, PREVIEW_M, PREVIEW_M, PREVIEW_M));
QPainter painter(this);
// draw image
const QRect ir = m_image.rect();
const QPoint offset = r.center() - ir.center();
painter.fillRect(offset.x(), offset.y(), ir.width(), ir.height(), Qt::white);
painter.drawImage(offset.x(), offset.y(), m_image);
// bottom black background
QRect bgr = r;
bgr.setTop(bgr.bottom() - 30);
painter.fillRect(bgr, QColor(0, 0, 0, 255 * 0.3));
// bottom title
painter.drawText(bgr, Qt::AlignCenter, m_title);
// draw border
if (m_hovered)
if (m_wmHelper->hasComposite())
{
const QRect br = r.marginsAdded(QMargins(1, 1, 1, 1));
QPen p;
p.setBrush(Qt::white);
p.setWidth(4);
painter.setBrush(Qt::transparent);
painter.setRenderHint(QPainter::Antialiasing);
painter.drawRoundedRect(br, 3, 3);
const QRect r = rect().marginsRemoved(QMargins(PREVIEW_M, PREVIEW_M, PREVIEW_M, PREVIEW_M));
// draw image
const QRect ir = m_image.rect();
const QPoint offset = r.center() - ir.center();
painter.fillRect(offset.x(), offset.y(), ir.width(), ir.height(), Qt::white);
painter.drawImage(offset.x(), offset.y(), m_image);
// bottom black background
QRect bgr = r;
bgr.setTop(bgr.bottom() - 30);
painter.fillRect(bgr, QColor(0, 0, 0, 255 * 0.3));
// bottom title
painter.drawText(bgr, Qt::AlignCenter, m_title);
// draw border
if (m_hovered)
{
const QRect br = r.marginsAdded(QMargins(1, 1, 1, 1));
QPen p;
p.setBrush(Qt::white);
p.setWidth(4);
painter.setBrush(Qt::transparent);
painter.setRenderHint(QPainter::Antialiasing);
painter.drawRoundedRect(br, 3, 3);
}
} else {
const QRect r = rect();
if (m_hovered)
painter.fillRect(r, QColor(255, 255, 255, .3 * 255));
painter.drawText(r.marginsRemoved(QMargins(10, 0, 25, 0)), Qt::AlignLeft | Qt::AlignVCenter, m_title);
}
QWidget::paintEvent(e);

7
frame/item/components/previewwidget.h
View File

@ -5,8 +5,10 @@
#include <QDebug>
#include <QDragEnterEvent>
#include <QTimer>
#include <QVBoxLayout>
#include <dimagebutton.h>
#include <dwindowmanagerhelper.h>
DWIDGET_USE_NAMESPACE
@ -29,6 +31,8 @@ private slots:
void closeWindow();
void showPreview();
void updatePreviewSize();
private:
void paintEvent(QPaintEvent *e);
void enterEvent(QEvent *e);
@ -44,11 +48,14 @@ private:
QString m_title;
DImageButton *m_closeButton;
QVBoxLayout *m_centralLayout;
QTimer *m_droppedDelay;
QTimer *m_mouseEnterTimer;
bool m_hovered;
DWindowManagerHelper *m_wmHelper;
};
#endif // PREVIEWWIDGET_H