vinzenz/nova-shell
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: vinzenz:0c89b570ac5bd293fc68b0e22e4c8b172f2edf4a
Branches Tags
vinzenz:main
..
compare: vinzenz:f65bd90bfd07c0322462c6230c5f624275cbffbf
Branches Tags
vinzenz:main

No commits in common. "0c89b570ac5bd293fc68b0e22e4c8b172f2edf4a" and "f65bd90bfd07c0322462c6230c5f624275cbffbf" have entirely different histories.
0c89b570ac ... f65bd90bfd

4 changed files with 14 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/Bar.qml
View file

@ -127,7 +127,6 @@ PanelWindow {
spacing: M.Theme.barSpacing
M.BarGroup {
leftEdge: true
M.Workspaces {
bar: bar
visible: M.Modules.workspaces.enable
@ -215,7 +214,6 @@ PanelWindow {
// Power
M.BarGroup {
rightEdge: true
M.Battery {}
M.Power {
bar: bar

27
modules/BarGroup.qml
View file

@ -17,13 +17,6 @@ Item {
return Math.max(0, Math.min(1, gx / scr.width));
}
property color borderColor: Qt.rgba(M.Theme.base0C.r + (M.Theme.base09.r - M.Theme.base0C.r) * _posFrac, M.Theme.base0C.g + (M.Theme.base09.g - M.Theme.base0C.g) * _posFrac, M.Theme.base0C.b + (M.Theme.base09.b - M.Theme.base0C.b) * _posFrac, 1)
property bool leftEdge: false
property bool rightEdge: false
readonly property real _tlr: leftEdge ? M.Theme.screenRadius : M.Theme.radius
readonly property real _trr: rightEdge ? M.Theme.screenRadius : M.Theme.radius
readonly property real _blr: M.Theme.radius
readonly property real _brr: M.Theme.radius
visible: row.visibleChildren.length > 0
@ -39,10 +32,7 @@ Item {
color: "transparent"
border.color: root.borderColor
border.width: 1
topLeftRadius: root._tlr
topRightRadius: root._trr
bottomLeftRadius: root._blr
bottomRightRadius: root._brr
radius: M.Theme.radius
visible: false
}
@ -59,20 +49,14 @@ Item {
// Solid background
Rectangle {
anchors.fill: parent
topLeftRadius: root._tlr
topRightRadius: root._trr
bottomLeftRadius: root._blr
bottomRightRadius: root._brr
radius: M.Theme.radius
color: M.Theme.base01
}
// Accent gradient overlay
Rectangle {
anchors.fill: parent
topLeftRadius: root._tlr
topRightRadius: root._trr
bottomLeftRadius: root._blr
bottomRightRadius: root._brr
radius: M.Theme.radius
gradient: Gradient {
GradientStop {
position: 0
@ -91,10 +75,7 @@ Item {
color: "transparent"
border.color: root.borderColor
border.width: 1
topLeftRadius: root._tlr
topRightRadius: root._trr
bottomLeftRadius: root._blr
bottomRightRadius: root._brr
radius: M.Theme.radius
}
Row {

18
modules/NotifCenter.qml
View file

@ -69,9 +69,13 @@ M.PopupPanel {
function _cascadeDismiss() {
const dels = _delegates.filter(d => d && d.modelData && !d.modelData.closed);
for (let i = 0; i < dels.length; i++) {
_cascadeTimer.createObject(menuWindow, {
_target: dels[i],
_delay: i * 60
const d = dels[i];
const delay = i * 60;
Qt.callLater(() => {
_cascadeTimer.createObject(menuWindow, {
_target: d,
_delay: delay
});
});
}
}
@ -83,8 +87,8 @@ M.PopupPanel {
interval: _delay
running: true
onTriggered: {
if (_target && _target.dismiss)
_target.dismiss();
if (_target && _target._dismissAnim)
_target._dismissAnim.start();
destroy();
}
}
@ -115,10 +119,6 @@ M.PopupPanel {
readonly property real _targetHeight: notifContent.height + 12
property real _heightScale: 1
function dismiss() {
_dismissAnim.start();
}
Component.onCompleted: {
menuWindow._delegates.push(notifItem);
fadeIn.start();

2
modules/NotifService.qml
View file

@ -107,7 +107,7 @@ QtObject {
property Component _expireTimer: Component {
Timer {
property var _notifId
property string _notifId
running: true
onTriggered: {
root.dismissPopup(_notifId);