yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

effects/overview: Allow setting ExpoCell margins

Browse source
This commit is contained in:
Vlad Zahorodnii 2021-09-02 14:26:29 +03:00
parent 9995f984c3
commit 79a7cf1aec
2 changed files with 40 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/effects/overview/expolayout.cpp
View file

@ -130,6 +130,11 @@ QRect ExpoCell::naturalRect() const
return QRect(naturalX(), naturalY(), naturalWidth(), naturalHeight());
}
QMargins ExpoCell::margins() const
{
return m_margins;
}
int ExpoCell::x() const
{
return m_x.value_or(0);
@ -196,6 +201,20 @@ void ExpoCell::setPersistentKey(const QString &key)
}
}
int ExpoCell::bottomMargin() const
{
return m_margins.bottom();
}
void ExpoCell::setBottomMargin(int margin)
{
if (m_margins.bottom() != margin) {
m_margins.setBottom(margin);
update();
Q_EMIT bottomMarginChanged();
}
}
ExpoLayout::ExpoLayout(QQuickItem *parent)
: QQuickItem(parent)
{
@ -303,6 +322,17 @@ static int distance(const QPoint &a, const QPoint &b)
return int(std::sqrt(qreal(xdiff * xdiff + ydiff * ydiff)));
}
static QRect centered(ExpoCell *cell, const QRect &bounds)
{
const QSize scaled = QSize(cell->naturalWidth(), cell->naturalHeight())
.scaled(bounds.size(), Qt::KeepAspectRatio);
return QRect(bounds.center().x() - scaled.width() / 2,
bounds.center().y() - scaled.height() / 2,
scaled.width(),
scaled.height());
}
void ExpoLayout::calculateWindowTransformationsClosest()
{
QRect area = QRect(0, 0, width(), height());
@ -363,6 +393,7 @@ void ExpoLayout::calculateWindowTransformationsClosest()
area.y() + (slot / columns) * slotHeight,
slotWidth, slotHeight);
target.adjust(m_spacing, m_spacing, -m_spacing, -m_spacing); // Borders
target = target.marginsRemoved(cell->margins());
qreal scale;
if (target.width() / qreal(cell->naturalWidth()) < target.height() / qreal(cell->naturalHeight())) {
@ -574,7 +605,7 @@ void ExpoLayout::calculateWindowTransformationsNatural()
if (m_cells.count() == 1) {
// Just move the window to its original location to save time
ExpoCell *cell = m_cells.constFirst();
if (area.contains(QRect(cell->naturalX(), cell->naturalY(), cell->naturalWidth(), cell->naturalHeight()))) {
if (area.contains(cell->naturalRect().marginsAdded(cell->margins()))) {
cell->setX(cell->naturalX());
cell->setY(cell->naturalY());
cell->setWidth(cell->naturalWidth());
@ -808,7 +839,7 @@ void ExpoLayout::calculateWindowTransformationsNatural()
}
for (ExpoCell *cell : qAsConst(m_cells)) {
const QRect rect = targets.value(cell);
const QRect rect = centered(cell, targets.value(cell).marginsRemoved(cell->margins()));
cell->setX(rect.x());
cell->setY(rect.y());

7
src/effects/overview/expolayout.h
View file

@ -83,6 +83,7 @@ class ExpoCell : public QObject
Q_PROPERTY(int width READ width NOTIFY widthChanged)
Q_PROPERTY(int height READ height NOTIFY heightChanged)
Q_PROPERTY(QString persistentKey READ persistentKey WRITE setPersistentKey NOTIFY persistentKeyChanged)
Q_PROPERTY(int bottomMargin READ bottomMargin WRITE setBottomMargin NOTIFY bottomMarginChanged)
public:
explicit ExpoCell(QObject *parent = nullptr);
@ -104,6 +105,7 @@ public:
void setNaturalHeight(int height);
QRect naturalRect() const;
QMargins margins() const;
int x() const;
void setX(int x);
@ -120,6 +122,9 @@ public:
QString persistentKey() const;
void setPersistentKey(const QString &key);
int bottomMargin() const;
void setBottomMargin(int margin);
public Q_SLOTS:
void update();
@ -134,6 +139,7 @@ Q_SIGNALS:
void widthChanged();
void heightChanged();
void persistentKeyChanged();
void bottomMarginChanged();
private:
QString m_persistentKey;
@ -141,6 +147,7 @@ private:
int m_naturalY = 0;
int m_naturalWidth = 0;
int m_naturalHeight = 0;
QMargins m_margins;
std::optional<int> m_x;
std::optional<int> m_y;
std::optional<int> m_width;