Notification: update clear icon

4 years ago · ae08aa21a9
parent 5ed5670ab9
commit ae08aa21a9
6 changed files with 65 additions and 16 deletions
--- a/2
+++ b/2
@ -1,2 +1,2 @@
 [General]
-Version=0.5
+Version=0.5.1
--- a/notificationd/historymodel.cpp
+++ b/notificationd/historymodel.cpp
@ -1,3 +1,22 @@
+/*
+ * 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 "historymodel.h"

 #include <QSettings>
--- a/notificationd/historymodel.h
+++ b/notificationd/historymodel.h
@ -1,3 +1,22 @@
+/*
+ * 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 HISTORYMODEL_H
 #define HISTORYMODEL_H

--- a/notificationd/images/dark/clear.svg
+++ b/notificationd/images/dark/clear.svg
@ -14,5 +14,5 @@
        color:#363636;
      }</style>
 </defs>
- <path class="ColorScheme-Text" d="m18.564 3.7559-3.2656 5.8184-2.416-1.4355-1.0215 1.7188 5.6504 3.3594 1.0215-1.7207-2.375-1.4121 3.2773-5.8398-0.87109-0.48828zm-10.564 3.2441a1 1 0 0 0-1 1 1 1 0 0 0 1 1 1 1 0 0 0 1-1 1 1 0 0 0-1-1zm-3.5 1a0.5 0.5 0 0 0-0.5 0.5 0.5 0.5 0 0 0 0.5 0.5 0.5 0.5 0 0 0 0.5-0.5 0.5 0.5 0 0 0-0.5-0.5zm1.5 2a1 1 0 0 0-1 1 1 1 0 0 0 1 1 1 1 0 0 0 1-1 1 1 0 0 0-1-1zm5 1c-1.1185 1.5643-3.1645 2.8109-7 3v1c2.1137 3.3717 5 5 9 5h1c1.3112-1.5872 2.3575-3.0324 3-5v-1l-5-3h-1zm0.5293 1.1016 4.3281 2.5977c-0.57283 1.5466-1.472 2.9036-2.584 4.2695-3.2734 0.03125-6.2207-1.4282-7.9473-4.1387 3.1182-0.31062 5.0195-1.2848 6.2031-2.7285z" fill="#fff"/>
+ <path class="ColorScheme-Text" d="m18.564 3.7559-3.2656 5.8184-2.416-1.4355-1.0215 1.7188 5.6504 3.3594 1.0215-1.7207-2.375-1.4121 3.2773-5.8398zm-7.5645 7.2441c-1.1185 1.5643-3.1645 2.8109-7 3v1c2.1137 3.3717 5 5 9 5h1c1.3112-1.5872 2.3575-3.0324 3-5v-1l-5-3zm0.5293 1.1016 4.3281 2.5977c-0.57283 1.5466-1.472 2.9036-2.584 4.2695-3.2734 0.03125-6.2207-1.4282-7.9473-4.1387 3.1182-0.31062 5.0195-1.2848 6.2031-2.7285z" fill="#fff"/>
 </svg>
--- a/notificationd/images/light/clear.svg
+++ b/notificationd/images/light/clear.svg
@ -1,13 +1,18 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
-  <defs id="defs3051">
-    <style type="text/css" id="current-color-scheme">
-      .ColorScheme-Text {
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <metadata>
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <defs>
+  <style id="current-color-scheme" type="text/css">.ColorScheme-Text {
        color:#363636;
-      }
-      </style>
+      }</style>
 </defs>
- <path style="fill:currentColor;fill-opacity:1;stroke:none" 
-     d="M 18.564453 3.7558594 L 15.298828 9.5742188 L 12.882812 8.1386719 L 11.861328 9.8574219 L 17.511719 13.216797 L 18.533203 11.496094 L 16.158203 10.083984 L 19.435547 4.2441406 L 18.564453 3.7558594 z M 8 7 A 1 1 0 0 0 7 8 A 1 1 0 0 0 8 9 A 1 1 0 0 0 9 8 A 1 1 0 0 0 8 7 z M 4.5 8 A 0.5 0.5 0 0 0 4 8.5 A 0.5 0.5 0 0 0 4.5 9 A 0.5 0.5 0 0 0 5 8.5 A 0.5 0.5 0 0 0 4.5 8 z M 6 10 A 1 1 0 0 0 5 11 A 1 1 0 0 0 6 12 A 1 1 0 0 0 7 11 A 1 1 0 0 0 6 10 z M 11 11 C 9.8815125 12.564268 7.8355055 13.810894 4 14 L 4 15 C 6.1137135 18.371692 9 20 13 20 L 14 20 C 15.311249 18.412805 16.357513 16.967619 17 15 L 17 14 L 12 11 L 11 11 z M 11.529297 12.101562 L 15.857422 14.699219 C 15.284594 16.24586 14.385404 17.602833 13.273438 18.96875 C 9.999999 19 7.052768 17.540538 5.3261719 14.830078 C 8.4443879 14.51946 10.345716 13.545307 11.529297 12.101562 z "
-     class="ColorScheme-Text"
-     />
+ <path class="ColorScheme-Text" d="m18.564 3.7559-3.2656 5.8184-2.416-1.4355-1.0215 1.7188 5.6504 3.3594 1.0215-1.7207-2.375-1.4121 3.2773-5.8398zm-7.5645 7.2441c-1.1185 1.5643-3.1645 2.8109-7 3v1c2.1137 3.3717 5 5 9 5h1c1.3112-1.5872 2.3575-3.0324 3-5v-1l-5-3zm0.5293 1.1016 4.3281 2.5977c-0.57283 1.5466-1.472 2.9036-2.584 4.2695-3.2734 0.03125-6.2207-1.4282-7.9473-4.1387 3.1182-0.31062 5.0195-1.2848 6.2031-2.7285z" fill="currentColor"/>
 </svg>
--- a/notificationd/qml/NotificationWindow.qml
+++ b/notificationd/qml/NotificationWindow.qml
@ -147,6 +147,12 @@ Item {
                                                       : 0.03
                    }

+                    MouseArea {
+                        id: _itemMouseArea
+                        anchors.fill: parent
+                        hoverEnabled: true
+                    }
+
                    RowLayout {
                        anchors.fill: parent
                        anchors.margins: FishUI.Units.smallSpacing
@ -205,7 +211,7 @@ Item {
                        height: 24
                        source: "qrc:/images/" + (FishUI.Theme.darkMode ? "dark" : "light") + "/close.svg"
                        sourceSize: Qt.size(width, height)
-                        visible: true
+                        visible: _itemMouseArea.containsMouse
                        z: 9999

                        Rectangle {
@ -216,14 +222,14 @@ Item {

                            z: -1
                            anchors.fill: parent
-                            color: _closeBtnArea.pressed ? pressedColor : _closeBtnArea.containsMouse ? hoveredColor : "transparent"
+                            color: "transparent"
                            radius: height / 2
                        }

                        MouseArea {
                            id: _closeBtnArea
                            anchors.fill: parent
-                            hoverEnabled: true
+                            // hoverEnabled: true
                            onClicked: {
                                historyModel.remove(index)
                            }