Remove dockbackground class
This commit is contained in:
parent
96df3111b2
commit
68442e5280
4 changed files with 0 additions and 166 deletions
|
@ -27,7 +27,6 @@ set(SRCS
|
||||||
src/trashmanager.cpp
|
src/trashmanager.cpp
|
||||||
src/utils.cpp
|
src/utils.cpp
|
||||||
src/xwindowinterface.cpp
|
src/xwindowinterface.cpp
|
||||||
src/dockbackground.cpp
|
|
||||||
src/activity.cpp
|
src/activity.cpp
|
||||||
|
|
||||||
src/fakewindow.cpp
|
src/fakewindow.cpp
|
||||||
|
|
|
@ -1,110 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (C) 2021 CutefishOS Team.
|
|
||||||
*
|
|
||||||
* Author: rekols <revenmartin@gmail.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 "dockbackground.h"
|
|
||||||
|
|
||||||
#include <QApplication>
|
|
||||||
#include <QPainterPath>
|
|
||||||
#include <QPainter>
|
|
||||||
|
|
||||||
DockBackground::DockBackground()
|
|
||||||
: m_radius(0)
|
|
||||||
{
|
|
||||||
setSmooth(true);
|
|
||||||
setAntialiasing(true);
|
|
||||||
}
|
|
||||||
|
|
||||||
QColor DockBackground::color() const
|
|
||||||
{
|
|
||||||
return m_color;
|
|
||||||
}
|
|
||||||
|
|
||||||
void DockBackground::setColor(QColor color)
|
|
||||||
{
|
|
||||||
if (m_color != color) {
|
|
||||||
m_color = color;
|
|
||||||
update();
|
|
||||||
emit colorChanged();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
qreal DockBackground::radius() const
|
|
||||||
{
|
|
||||||
return m_radius;
|
|
||||||
}
|
|
||||||
|
|
||||||
void DockBackground::setRadius(qreal radius)
|
|
||||||
{
|
|
||||||
if (m_radius != radius) {
|
|
||||||
m_radius = radius;
|
|
||||||
update();
|
|
||||||
emit radiusChanged();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void DockBackground::paint(QPainter *painter)
|
|
||||||
{
|
|
||||||
if (!qApp)
|
|
||||||
return;
|
|
||||||
|
|
||||||
// Enable antialiasing.
|
|
||||||
painter->setRenderHint(QPainter::Antialiasing);
|
|
||||||
painter->save();
|
|
||||||
|
|
||||||
QRectF rect = boundingRect();
|
|
||||||
QPainterPath path;
|
|
||||||
QPen pen;
|
|
||||||
|
|
||||||
// Draw background.
|
|
||||||
path.addRoundedRect(rect.x(), rect.y(), rect.width(), rect.height(), m_radius, m_radius);
|
|
||||||
painter->setBrush(m_color);
|
|
||||||
painter->setPen(Qt::NoPen);
|
|
||||||
painter->drawPath(path);
|
|
||||||
|
|
||||||
// Draw border line.
|
|
||||||
path.clear();
|
|
||||||
path.addRoundedRect(rect.adjusted(0.5, 0.5, -0.5, -0.5),
|
|
||||||
m_radius - 0.5,
|
|
||||||
m_radius - 0.5);
|
|
||||||
painter->setBrush(Qt::NoBrush);
|
|
||||||
pen.setColor(QColor(0, 0, 0, 255));
|
|
||||||
pen.setWidthF(0.5);
|
|
||||||
painter->setPen(pen);
|
|
||||||
painter->setBrush(Qt::NoBrush);
|
|
||||||
painter->drawPath(path);
|
|
||||||
|
|
||||||
path.clear();
|
|
||||||
path.addRoundedRect(rect.adjusted(1, 1, -1, -1),
|
|
||||||
m_radius - 1,
|
|
||||||
m_radius - 1);
|
|
||||||
painter->setBrush(Qt::NoBrush);
|
|
||||||
pen.setColor(QColor(255, 255, 255, 255));
|
|
||||||
pen.setWidthF(0.5);
|
|
||||||
painter->setPen(pen);
|
|
||||||
painter->setBrush(Qt::NoBrush);
|
|
||||||
painter->drawPath(path);
|
|
||||||
painter->restore();
|
|
||||||
}
|
|
||||||
|
|
||||||
void DockBackground::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
|
|
||||||
{
|
|
||||||
QQuickItem::geometryChanged(newGeometry, oldGeometry);
|
|
||||||
|
|
||||||
update();
|
|
||||||
}
|
|
|
@ -1,53 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (C) 2021 CutefishOS Team.
|
|
||||||
*
|
|
||||||
* Author: rekols <revenmartin@gmail.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 DOCKBACKGROUND_H
|
|
||||||
#define DOCKBACKGROUND_H
|
|
||||||
|
|
||||||
#include <QQuickPaintedItem>
|
|
||||||
|
|
||||||
class DockBackground : public QQuickPaintedItem
|
|
||||||
{
|
|
||||||
Q_OBJECT
|
|
||||||
Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged)
|
|
||||||
Q_PROPERTY(qreal radius READ radius WRITE setRadius NOTIFY radiusChanged)
|
|
||||||
|
|
||||||
public:
|
|
||||||
DockBackground();
|
|
||||||
|
|
||||||
QColor color() const;
|
|
||||||
void setColor(QColor color);
|
|
||||||
|
|
||||||
qreal radius() const;
|
|
||||||
void setRadius(qreal radius);
|
|
||||||
|
|
||||||
void paint(QPainter *painter) override;
|
|
||||||
void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override;
|
|
||||||
|
|
||||||
signals:
|
|
||||||
void colorChanged();
|
|
||||||
void radiusChanged();
|
|
||||||
|
|
||||||
private:
|
|
||||||
qreal m_radius;
|
|
||||||
|
|
||||||
QColor m_color;
|
|
||||||
};
|
|
||||||
|
|
||||||
#endif // DOCKBACKGROUND_H
|
|
|
@ -25,7 +25,6 @@
|
||||||
#include <QDBusConnection>
|
#include <QDBusConnection>
|
||||||
|
|
||||||
#include "applicationmodel.h"
|
#include "applicationmodel.h"
|
||||||
#include "dockbackground.h"
|
|
||||||
#include "mainwindow.h"
|
#include "mainwindow.h"
|
||||||
|
|
||||||
int main(int argc, char *argv[])
|
int main(int argc, char *argv[])
|
||||||
|
@ -39,7 +38,6 @@ int main(int argc, char *argv[])
|
||||||
}
|
}
|
||||||
|
|
||||||
qmlRegisterType<DockSettings>("Cutefish.Dock", 1, 0, "DockSettings");
|
qmlRegisterType<DockSettings>("Cutefish.Dock", 1, 0, "DockSettings");
|
||||||
qmlRegisterType<DockBackground>("Cutefish.Dock", 1, 0, "DockBackground");
|
|
||||||
|
|
||||||
QString qmFilePath = QString("%1/%2.qm").arg("/usr/share/cutefish-dock/translations/").arg(QLocale::system().name());
|
QString qmFilePath = QString("%1/%2.qm").arg("/usr/share/cutefish-dock/translations/").arg(QLocale::system().name());
|
||||||
if (QFile::exists(qmFilePath)) {
|
if (QFile::exists(qmFilePath)) {
|
||||||
|
|
Loading…
Reference in a new issue