change some colors and styling, fix a issue with activeAsync in notifications Window
This commit is contained in:
@@ -1,6 +1,5 @@
|
|||||||
// CalendarComponent.qml (For one month)
|
// CalendarComponent.qml (For one month)
|
||||||
import QtQuick
|
import QtQuick
|
||||||
import QtQuick.Controls
|
|
||||||
import qs.Common
|
import qs.Common
|
||||||
import qs.Common.Styled
|
import qs.Common.Styled
|
||||||
|
|
||||||
@@ -93,7 +92,7 @@ Item {
|
|||||||
let isCurrentMonth = root.targetYear === root.currentDate.getFullYear() && root.targetMonth === root.currentDate.getMonth();
|
let isCurrentMonth = root.targetYear === root.currentDate.getFullYear() && root.targetMonth === root.currentDate.getMonth();
|
||||||
let isCurrentDay = isCurrentMonth && modelData === root.currentDate.getDate();
|
let isCurrentDay = isCurrentMonth && modelData === root.currentDate.getDate();
|
||||||
|
|
||||||
return isCurrentDay ? Theme.color6Bright : Theme.textColor;
|
return isCurrentDay ? Theme.color5Bright : Theme.textColor;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -74,9 +74,10 @@ Item {
|
|||||||
|
|
||||||
onClicked: mouse => {
|
onClicked: mouse => {
|
||||||
if (mouse.button === Qt.RightButton) {
|
if (mouse.button === Qt.RightButton) {
|
||||||
NotificationService.manualNotificationsMuted = !NotificationService.manualNotificationsMuted
|
NotificationService.manualNotificationsMuted = !NotificationService.manualNotificationsMuted;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
console.log(root.createWindow);
|
||||||
root.createWindow = !root.createWindow;
|
root.createWindow = !root.createWindow;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -85,11 +86,10 @@ Item {
|
|||||||
LazyLoader {
|
LazyLoader {
|
||||||
id: windowLoader
|
id: windowLoader
|
||||||
|
|
||||||
activeAsync: NotificationService.notificationsNumber ? createWindow : false
|
active: NotificationService.notificationsNumber ? root.createWindow : false
|
||||||
|
|
||||||
component: NotificationWindow {
|
component: NotificationWindow {
|
||||||
onClear: root.createWindow = false
|
onClear: root.createWindow = false
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -32,7 +32,8 @@ PanelWindow {
|
|||||||
contentItem {
|
contentItem {
|
||||||
focus: true
|
focus: true
|
||||||
Keys.onPressed: event => {
|
Keys.onPressed: event => {
|
||||||
if (event.key == Qt.Key_Escape) notificationRoot.clear();
|
if (event.key == Qt.Key_Escape)
|
||||||
|
notificationRoot.clear();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
MouseArea {
|
MouseArea {
|
||||||
@@ -68,7 +69,7 @@ PanelWindow {
|
|||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
onClicked: {
|
onClicked: {
|
||||||
while (NotificationService.notificationsNumber != 0) {
|
while (NotificationService.notificationsNumber != 0) {
|
||||||
NotificationService.notificationDismiss(NotificationService.trackedNotifications.get(0).notif)
|
NotificationService.notificationDismiss(NotificationService.trackedNotifications.get(0).notif);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -65,7 +65,7 @@ WrapperMouseArea {
|
|||||||
when: workspacesRectangle.workspaceActive
|
when: workspacesRectangle.workspaceActive
|
||||||
PropertyChanges {
|
PropertyChanges {
|
||||||
workspacesRectangle {
|
workspacesRectangle {
|
||||||
color: Theme.color6
|
color: Theme.color5
|
||||||
implicitWidth: Theme.barSize * 1.5
|
implicitWidth: Theme.barSize * 1.5
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user