From 552126fb6c32133dc866c2c6928dc7099ad099f9 Mon Sep 17 00:00:00 2001 From: reionwong Date: Thu, 16 Sep 2021 15:02:19 +0800 Subject: [PATCH] Update --- debian/changelog | 6 +- debian/control | 2 +- debian/copyright | 2 +- plugins/cutefish_multitasking/CMakeLists.txt | 0 plugins/decoration/button.cpp | 3 +- plugins/decoration/decoration.cpp | 21 +- plugins/decoration/decoration.h | 2 +- .../decoration/images/dark/close_normal.svg | 99 +----- .../images/dark/maximize_normal.svg | 102 +----- .../images/dark/minimize_normal.svg | 81 +---- .../decoration/images/dark/restore_normal.svg | 94 +---- .../decoration/images/light/close_normal.svg | 99 +----- .../images/light/maximize_normal.svg | 102 +----- .../images/light/minimize_normal.svg | 81 +---- .../images/light/restore_normal.svg | 324 +----------------- plugins/roundedwindow/roundedwindow.cpp | 6 +- 16 files changed, 67 insertions(+), 957 deletions(-) create mode 100644 plugins/cutefish_multitasking/CMakeLists.txt diff --git a/debian/changelog b/debian/changelog index 475fd31..0f6d833 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,5 @@ -cutefish-kwin-plugins (0.1) UNRELEASED; urgency=low +cutefish-kwin-plugins (0.5) UNRELEASED; urgency=low - * Initial release (CutefishOS) + * Initial release (CutefishOS) - -- CutefishOS Thu, 16 Oct 2014 17:22:15 +0200 + -- CutefishOS Packaging Team Thu, 16 Sep 2021 02:31:42 +0800 \ No newline at end of file diff --git a/debian/control b/debian/control index eee8d6a..9b14dc1 100644 --- a/debian/control +++ b/debian/control @@ -22,7 +22,7 @@ Build-Depends: cmake, qttools5-dev, qttools5-dev-tools Standards-Version: 4.5.0 -Homepage: https://github.com/cutefishos/terminal +Homepage: https://cutefishos.com Package: cutefish-kwin-plugins Architecture: any diff --git a/debian/copyright b/debian/copyright index 716fe64..6baa66e 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,3 +1,3 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: calamares +Upstream-Name: cutefish-kwin-plugins Source: diff --git a/plugins/cutefish_multitasking/CMakeLists.txt b/plugins/cutefish_multitasking/CMakeLists.txt new file mode 100644 index 0000000..e69de29 diff --git a/plugins/decoration/button.cpp b/plugins/decoration/button.cpp index 3368202..4c9cca3 100644 --- a/plugins/decoration/button.cpp +++ b/plugins/decoration/button.cpp @@ -71,7 +71,8 @@ void Button::paint(QPainter *painter, const QRect &repaintRegion) const QRect &rect = geometry().toRect(); painter->save(); - painter->setRenderHints(QPainter::Antialiasing); + painter->setRenderHint(QPainter::SmoothPixmapTransform, false); + painter->setRenderHints(QPainter::Antialiasing, true); QRect btnRect(0, 0, 29 * decoration->devicePixelRatio(), 29 * decoration->devicePixelRatio()); diff --git a/plugins/decoration/decoration.cpp b/plugins/decoration/decoration.cpp index e456587..5709093 100644 --- a/plugins/decoration/decoration.cpp +++ b/plugins/decoration/decoration.cpp @@ -106,7 +106,7 @@ void Decoration::init() auto s = settings(); m_devicePixelRatio = m_settings->value("PixelRatio", 1.0).toReal(); - m_frameRadius = 12 * m_devicePixelRatio; + m_frameRadius = 11 * m_devicePixelRatio; reconfigure(); updateTitleBar(); @@ -329,12 +329,13 @@ void Decoration::updateShadow() void Decoration::updateBtnPixmap() { + int size = 30; QString dirName = darkMode() ? "dark" : "light"; - m_closeBtnPixmap = fromSvgToPixmap(QString(":/images/%1/close_normal.svg").arg(dirName), QSize(30, 30)); - m_maximizeBtnPixmap = fromSvgToPixmap(QString(":/images/%1/maximize_normal.svg").arg(dirName), QSize(30, 30)); - m_minimizeBtnPixmap = fromSvgToPixmap(QString(":/images/%1/minimize_normal.svg").arg(dirName), QSize(30, 30)); - m_restoreBtnPixmap = fromSvgToPixmap(QString(":/images/%1/restore_normal.svg").arg(dirName), QSize(30, 30)); + m_closeBtnPixmap = fromSvgToPixmap(QString(":/images/%1/close_normal.svg").arg(dirName), QSize(size, size)); + m_maximizeBtnPixmap = fromSvgToPixmap(QString(":/images/%1/maximize_normal.svg").arg(dirName), QSize(size, size)); + m_minimizeBtnPixmap = fromSvgToPixmap(QString(":/images/%1/minimize_normal.svg").arg(dirName), QSize(size, size)); + m_restoreBtnPixmap = fromSvgToPixmap(QString(":/images/%1/restore_normal.svg").arg(dirName), QSize(size, size)); } QPixmap Decoration::fromSvgToPixmap(const QString &file, const QSize &size) @@ -379,7 +380,7 @@ void Decoration::paintFrameBackground(QPainter *painter, const QRect &repaintReg { Q_UNUSED(repaintRegion) - const auto *decoratedClient = client().toStrongRef().data(); + // const auto *decoratedClient = client().toStrongRef().data(); painter->save(); @@ -421,8 +422,8 @@ void Decoration::paintCaption(QPainter *painter, const QRect &repaintRegion) con const QRect titleBarRect(0, 0, size().width(), titleBarHeight()); const QRect availableRect = titleBarRect.adjusted( - m_leftButtons->geometry().width() + settings()->smallSpacing(), 0, - -(m_rightButtons->geometry().width() + settings()->smallSpacing()), 0 + m_leftButtons->geometry().width() + 20, 0, + -(m_rightButtons->geometry().width() + 20), 0 ); QRect captionRect; @@ -439,8 +440,8 @@ void Decoration::paintCaption(QPainter *painter, const QRect &repaintRegion) con alignment = Qt::AlignCenter; } - const QString caption = painter->fontMetrics().elidedText( - decoratedClient->caption(), Qt::ElideMiddle, captionRect.width()); + const QString caption = painter->fontMetrics() + .elidedText(decoratedClient->caption(), Qt::ElideMiddle, captionRect.width()); painter->save(); painter->setFont(settings()->font()); diff --git a/plugins/decoration/decoration.h b/plugins/decoration/decoration.h index 0e34ef9..7892a40 100644 --- a/plugins/decoration/decoration.h +++ b/plugins/decoration/decoration.h @@ -92,7 +92,7 @@ private: private: int m_titleBarHeight = 33; - int m_frameRadius = 12; + int m_frameRadius = 11; qreal m_devicePixelRatio = 1.0; QColor m_titleBarBgColor = QColor(255, 255, 255, 255); QColor m_titleBarFgColor = QColor(56, 56, 56, 255); diff --git a/plugins/decoration/images/dark/close_normal.svg b/plugins/decoration/images/dark/close_normal.svg index e5552e1..c36640a 100644 --- a/plugins/decoration/images/dark/close_normal.svg +++ b/plugins/decoration/images/dark/close_normal.svg @@ -1,93 +1,10 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - + + + + + + + + diff --git a/plugins/decoration/images/dark/maximize_normal.svg b/plugins/decoration/images/dark/maximize_normal.svg index 60fdc15..ed8aa37 100644 --- a/plugins/decoration/images/dark/maximize_normal.svg +++ b/plugins/decoration/images/dark/maximize_normal.svg @@ -1,98 +1,6 @@ - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - + + + + + diff --git a/plugins/decoration/images/dark/minimize_normal.svg b/plugins/decoration/images/dark/minimize_normal.svg index 2cae8fd..651894d 100644 --- a/plugins/decoration/images/dark/minimize_normal.svg +++ b/plugins/decoration/images/dark/minimize_normal.svg @@ -1,78 +1,5 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - - - + + + + diff --git a/plugins/decoration/images/dark/restore_normal.svg b/plugins/decoration/images/dark/restore_normal.svg index 070d900..bb3fc7a 100644 --- a/plugins/decoration/images/dark/restore_normal.svg +++ b/plugins/decoration/images/dark/restore_normal.svg @@ -1,90 +1,6 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - + + + + + diff --git a/plugins/decoration/images/light/close_normal.svg b/plugins/decoration/images/light/close_normal.svg index 489f7e2..7c3a953 100644 --- a/plugins/decoration/images/light/close_normal.svg +++ b/plugins/decoration/images/light/close_normal.svg @@ -1,93 +1,10 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - + + + + + + + + diff --git a/plugins/decoration/images/light/maximize_normal.svg b/plugins/decoration/images/light/maximize_normal.svg index c6fecb1..cce2c4b 100644 --- a/plugins/decoration/images/light/maximize_normal.svg +++ b/plugins/decoration/images/light/maximize_normal.svg @@ -1,98 +1,6 @@ - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - + + + + + diff --git a/plugins/decoration/images/light/minimize_normal.svg b/plugins/decoration/images/light/minimize_normal.svg index e71f17b..9b376df 100644 --- a/plugins/decoration/images/light/minimize_normal.svg +++ b/plugins/decoration/images/light/minimize_normal.svg @@ -1,78 +1,5 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - - - + + + + diff --git a/plugins/decoration/images/light/restore_normal.svg b/plugins/decoration/images/light/restore_normal.svg index 4a087cf..cb8d26e 100644 --- a/plugins/decoration/images/light/restore_normal.svg +++ b/plugins/decoration/images/light/restore_normal.svg @@ -1,320 +1,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - + + + + + + diff --git a/plugins/roundedwindow/roundedwindow.cpp b/plugins/roundedwindow/roundedwindow.cpp index 1854044..85379a3 100644 --- a/plugins/roundedwindow/roundedwindow.cpp +++ b/plugins/roundedwindow/roundedwindow.cpp @@ -47,7 +47,8 @@ static QStringList allowList = { "netease-cloud-music netease-cloud-music", "mtxx mtxx", // Open source software - "code code" + "code code", + "motrix motrix" }; // From ubreffect @@ -187,11 +188,10 @@ static KWin::GLTexture *getTexture(int borderRadius) RoundedWindow::RoundedWindow(QObject *, const QVariantList &) : KWin::Effect() - , m_frameRadius(12) { QSettings settings(QSettings::UserScope, "cutefishos", "theme"); qreal devicePixelRatio = settings.value("PixelRatio", 1.0).toReal(); - m_frameRadius = 12 * devicePixelRatio; + m_frameRadius = 11 * devicePixelRatio; setDepthfunc = (SetDepth) QLibrary::resolve("kwin.so." + qApp->applicationVersion(), "_ZN4KWin8Toplevel8setDepthEi");