1
0
mirror of https://github.com/KDE/latte-dock.git synced 2025-01-11 13:18:13 +03:00

expose view padding through qml

This commit is contained in:
Michail Vourlakos 2020-12-24 18:25:23 +02:00
parent c7adae308e
commit b06e164f53
5 changed files with 183 additions and 1 deletions

View File

@ -3,6 +3,7 @@ set(lattedock-app_SRCS
${CMAKE_CURRENT_SOURCE_DIR}/containmentinterface.cpp
${CMAKE_CURRENT_SOURCE_DIR}/contextmenu.cpp
${CMAKE_CURRENT_SOURCE_DIR}/effects.cpp
${CMAKE_CURRENT_SOURCE_DIR}/padding.cpp
${CMAKE_CURRENT_SOURCE_DIR}/panelshadows.cpp
${CMAKE_CURRENT_SOURCE_DIR}/positioner.cpp
${CMAKE_CURRENT_SOURCE_DIR}/tasksmodel.cpp

100
app/view/padding.cpp Normal file
View File

@ -0,0 +1,100 @@
/*
* Copyright 2020 Michail Vourlakos <mvourlakos@gmail.com>
*
* This file is part of Latte-Dock
*
* Latte-Dock 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.
*
* Latte-Dock 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 "padding.h"
namespace Latte {
namespace ViewPart {
Padding::Padding(QObject *parent)
: QObject(parent)
{
}
Padding::~Padding()
{
}
bool Padding::isEmpty() const
{
return !((m_bottom > 0) || (m_top > 0) || (m_left > 0) || (m_right > 0));
}
int Padding::top() const
{
return m_top;
}
void Padding::setTop(int toppad)
{
if (m_top == toppad) {
return;
}
m_top = toppad;
emit paddingsChanged();
}
int Padding::bottom() const
{
return m_bottom;
}
void Padding::setBottom(int bottompad)
{
if (m_bottom == bottompad) {
return;
}
m_bottom = bottompad;
emit paddingsChanged();
}
int Padding::left() const
{
return m_left;
}
void Padding::setLeft(int leftpad)
{
if (m_left == leftpad) {
return;
}
m_left = leftpad;
emit paddingsChanged();
}
int Padding::right() const
{
return m_right;
}
void Padding::setRight(int rightpad)
{
if (m_right == rightpad) {
return;
}
m_right = rightpad;
emit paddingsChanged();
}
}
}

70
app/view/padding.h Normal file
View File

@ -0,0 +1,70 @@
/*
* Copyright 2020 Michail Vourlakos <mvourlakos@gmail.com>
*
* This file is part of Latte-Dock
*
* Latte-Dock 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.
*
* Latte-Dock 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 PADDING_H
#define PADDING_H
// Qt
#include <QObject>
namespace Latte {
namespace ViewPart {
class Padding: public QObject
{
Q_OBJECT
Q_PROPERTY(int top READ top WRITE setTop NOTIFY paddingsChanged)
Q_PROPERTY(int bottom READ bottom WRITE setBottom NOTIFY paddingsChanged)
Q_PROPERTY(int left READ left WRITE setLeft NOTIFY paddingsChanged)
Q_PROPERTY(int right READ right WRITE setRight NOTIFY paddingsChanged)
public:
Padding(QObject *parent);
virtual ~Padding();
bool isEmpty() const;
int top() const;
void setTop(int toppad);
int bottom() const;
void setBottom(int bottompad);
int left() const;
void setLeft(int leftpad);
int right() const;
void setRight(int rightpad);
signals:
void paddingsChanged();
private:
int m_left{0};
int m_right{0};
int m_top{0};
int m_bottom{0};
};
}
}
#endif

View File

@ -75,7 +75,8 @@ View::View(Plasma::Corona *corona, QScreen *targetScreen, bool byPassWM)
: PlasmaQuick::ContainmentView(corona),
m_contextMenu(new ViewPart::ContextMenu(this)),
m_effects(new ViewPart::Effects(this)),
m_interface(new ViewPart::ContainmentInterface(this))
m_interface(new ViewPart::ContainmentInterface(this)),
m_padding(new ViewPart::Padding(this))
{
//! needs to be created after Effects because it catches some of its signals
//! and avoid a crash from View::winId() at the same time
@ -1287,6 +1288,11 @@ ViewPart::ContainmentInterface *View::extendedInterface() const
return m_interface;
}
ViewPart::Padding *View::padding() const
{
return m_padding;
}
ViewPart::Positioner *View::positioner() const
{
return m_positioner;

View File

@ -25,6 +25,7 @@
#include <coretypes.h>
#include "containmentinterface.h"
#include "effects.h"
#include "padding.h"
#include "positioner.h"
#include "visibilitymanager.h"
#include "indicator/indicator.h"
@ -121,6 +122,7 @@ class View : public PlasmaQuick::ContainmentView
Q_PROPERTY(Latte::ViewPart::Effects *effects READ effects NOTIFY effectsChanged)
Q_PROPERTY(Latte::ViewPart::ContainmentInterface *extendedInterface READ extendedInterface NOTIFY extendedInterfaceChanged)
Q_PROPERTY(Latte::ViewPart::Indicator *indicator READ indicator NOTIFY indicatorChanged)
Q_PROPERTY(Latte::ViewPart::Padding *padding READ padding NOTIFY paddingChanged)
Q_PROPERTY(Latte::ViewPart::Positioner *positioner READ positioner NOTIFY positionerChanged)
Q_PROPERTY(Latte::ViewPart::VisibilityManager *visibility READ visibility NOTIFY visibilityChanged)
Q_PROPERTY(Latte::ViewPart::WindowsTracker *windowsTracker READ windowsTracker NOTIFY windowsTrackerChanged)
@ -235,6 +237,7 @@ public:
ViewPart::ContextMenu *contextMenu() const;
ViewPart::ContainmentInterface *extendedInterface() const;
ViewPart::Indicator *indicator() const;
ViewPart::Padding *padding() const;
ViewPart::Positioner *positioner() const;
ViewPart::VisibilityManager *visibility() const;
ViewPart::WindowsTracker *windowsTracker() const;
@ -319,6 +322,7 @@ signals:
void normalHighestThicknessChanged();
void offsetChanged();
void onPrimaryChanged();
void paddingChanged();
void positionerChanged();
void screenEdgeMarginChanged();
void screenEdgeMarginEnabledChanged();
@ -428,6 +432,7 @@ private:
QPointer<ViewPart::Effects> m_effects;
QPointer<ViewPart::Indicator> m_indicator;
QPointer<ViewPart::ContainmentInterface> m_interface;
QPointer<ViewPart::Padding> m_padding;
QPointer<ViewPart::Positioner> m_positioner;
QPointer<ViewPart::VisibilityManager> m_visibility;
QPointer<ViewPart::WindowsTracker> m_windowsTracker;