diff --git a/CMakeLists.txt b/CMakeLists.txt index 56968b1..0a8fcd4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,7 +27,6 @@ set(SRCS src/trashmanager.cpp src/utils.cpp src/xwindowinterface.cpp - src/dockbackground.cpp src/activity.cpp src/fakewindow.cpp diff --git a/src/dockbackground.cpp b/src/dockbackground.cpp deleted file mode 100644 index 50ecaf6..0000000 --- a/src/dockbackground.cpp +++ /dev/null @@ -1,110 +0,0 @@ -/* - * Copyright (C) 2021 CutefishOS Team. - * - * Author: rekols - * - * 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 . - */ - -#include "dockbackground.h" - -#include -#include -#include - -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(); -} diff --git a/src/dockbackground.h b/src/dockbackground.h deleted file mode 100644 index 2a895f8..0000000 --- a/src/dockbackground.h +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright (C) 2021 CutefishOS Team. - * - * Author: rekols - * - * 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 . - */ - -#ifndef DOCKBACKGROUND_H -#define DOCKBACKGROUND_H - -#include - -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 diff --git a/src/main.cpp b/src/main.cpp index 1e8576d..c757485 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -25,7 +25,6 @@ #include #include "applicationmodel.h" -#include "dockbackground.h" #include "mainwindow.h" int main(int argc, char *argv[]) @@ -39,7 +38,6 @@ int main(int argc, char *argv[]) } qmlRegisterType("Cutefish.Dock", 1, 0, "DockSettings"); - qmlRegisterType("Cutefish.Dock", 1, 0, "DockBackground"); QString qmFilePath = QString("%1/%2.qm").arg("/usr/share/cutefish-dock/translations/").arg(QLocale::system().name()); if (QFile::exists(qmFilePath)) {