Fix desktop margins
reionwong
4 years ago
parent
683f5a28b1
commit
48056de990
@ -0,0 +1,102 @@
|
||||
/*
|
||||
* Copyright (C) 2021 CutefishOS Team.
|
||||
*
|
||||
* Author: Reion Wong <reion@cutefishos.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 3 of the License, or
|
||||
* 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/>.
|
||||
*/
|
||||
|
||||
#include "dockdbusinterface.h"
|
||||
#include <QDBusServiceWatcher>
|
||||
#include <QRect>
|
||||
|
||||
static DockDBusInterface *DOCKDBUS_SELF = nullptr;
|
||||
|
||||
DockDBusInterface *DockDBusInterface::self()
|
||||
{
|
||||
if (!DOCKDBUS_SELF)
|
||||
DOCKDBUS_SELF = new DockDBusInterface;
|
||||
|
||||
return DOCKDBUS_SELF;
|
||||
}
|
||||
|
||||
DockDBusInterface::DockDBusInterface(QObject *parent)
|
||||
: QObject(parent)
|
||||
, m_dockInterface("com.cutefish.Dock",
|
||||
"/Dock",
|
||||
"com.cutefish.Dock", QDBusConnection::sessionBus())
|
||||
, m_leftMargin(0)
|
||||
, m_rightMargin(0)
|
||||
, m_bottomMargin(0)
|
||||
{
|
||||
if (m_dockInterface.isValid()) {
|
||||
updateMargins();
|
||||
connect(&m_dockInterface, SIGNAL(primaryGeometryChanged()), this, SLOT(updateMargins()));
|
||||
connect(&m_dockInterface, SIGNAL(directionChanged()), this, SLOT(updateMargins()));
|
||||
connect(&m_dockInterface, SIGNAL(visibilityChanged()), this, SLOT(updateMargins()));
|
||||
} else {
|
||||
QDBusServiceWatcher *watcher = new QDBusServiceWatcher("com.cutefish.Dock",
|
||||
QDBusConnection::sessionBus(),
|
||||
QDBusServiceWatcher::WatchForUnregistration,
|
||||
this);
|
||||
connect(watcher, &QDBusServiceWatcher::serviceUnregistered, this, [=] {
|
||||
updateMargins();
|
||||
connect(&m_dockInterface, SIGNAL(primaryGeometryChanged()), this, SLOT(updateMargins()));
|
||||
connect(&m_dockInterface, SIGNAL(directionChanged()), this, SLOT(updateMargins()));
|
||||
connect(&m_dockInterface, SIGNAL(visibilityChanged()), this, SLOT(updateMargins()));
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
int DockDBusInterface::leftMargin() const
|
||||
{
|
||||
return m_leftMargin;
|
||||
}
|
||||
|
||||
int DockDBusInterface::rightMargin() const
|
||||
{
|
||||
return m_rightMargin;
|
||||
}
|
||||
|
||||
int DockDBusInterface::bottomMargin() const
|
||||
{
|
||||
return m_bottomMargin;
|
||||
}
|
||||
|
||||
void DockDBusInterface::updateMargins()
|
||||
{
|
||||
QRect dockGeometry = m_dockInterface.property("primaryGeometry").toRect();
|
||||
int dockDirection = m_dockInterface.property("direction").toInt();
|
||||
int visibility = m_dockInterface.property("visibility").toInt();
|
||||
|
||||
m_leftMargin = 0;
|
||||
m_rightMargin = 0;
|
||||
m_bottomMargin = 0;
|
||||
|
||||
// AlwaysHide
|
||||
if (visibility == 1) {
|
||||
emit marginsChanged();
|
||||
return;
|
||||
}
|
||||
|
||||
if (dockDirection == 0) {
|
||||
m_leftMargin = dockGeometry.width();
|
||||
} else if (dockDirection == 1) {
|
||||
m_bottomMargin = dockGeometry.height();
|
||||
} else if (dockDirection == 2) {
|
||||
m_rightMargin = dockGeometry.width();
|
||||
}
|
||||
|
||||
emit marginsChanged();
|
||||
}
|
||||
@ -0,0 +1,55 @@
|
||||
/*
|
||||
* Copyright (C) 2021 CutefishOS Team.
|
||||
*
|
||||
* Author: Reion Wong <reion@cutefishos.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 3 of the License, or
|
||||
* 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 DOCKDBUSINTERFACE_H
|
||||
#define DOCKDBUSINTERFACE_H
|
||||
|
||||
#include <QObject>
|
||||
#include <QDBusInterface>
|
||||
|
||||
class DockDBusInterface : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
Q_PROPERTY(int leftMargin READ leftMargin NOTIFY marginsChanged)
|
||||
Q_PROPERTY(int rightMargin READ rightMargin NOTIFY marginsChanged)
|
||||
Q_PROPERTY(int bottomMargin READ bottomMargin NOTIFY marginsChanged)
|
||||
|
||||
public:
|
||||
static DockDBusInterface *self();
|
||||
explicit DockDBusInterface(QObject *parent = nullptr);
|
||||
|
||||
int leftMargin() const;
|
||||
int rightMargin() const;
|
||||
int bottomMargin() const;
|
||||
|
||||
signals:
|
||||
void marginsChanged();
|
||||
|
||||
private slots:
|
||||
void updateMargins();
|
||||
|
||||
private:
|
||||
QDBusInterface m_dockInterface;
|
||||
|
||||
int m_leftMargin;
|
||||
int m_rightMargin;
|
||||
int m_bottomMargin;
|
||||
};
|
||||
|
||||
#endif // DOCKDBUSINTERFACE_H
|
||||
Loading…
Reference in New Issue