Skip to content

Commit 573de3b

Browse files
committed
release v4.6.1
1 parent 1c3760b commit 573de3b

File tree

2 files changed

+88
-88
lines changed

2 files changed

+88
-88
lines changed

Modules/MainScreen/MainScreen.qml

Lines changed: 87 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -203,64 +203,64 @@ PanelWindow {
203203
}
204204

205205
// Blur behind the bar and open panels — attached to PanelWindow (required by BackgroundEffect API)
206-
BackgroundEffect.blurRegion: Region {
207-
// ── Non-framed bar (simple/floating): single rectangle with bar corner states ──
208-
Region {
209-
x: (!barPlaceholder.isFramed && root.barShouldShow && !barPlaceholder.isHidden) ? barPlaceholder.x : 0
210-
y: (!barPlaceholder.isFramed && root.barShouldShow && !barPlaceholder.isHidden) ? barPlaceholder.y : 0
211-
width: (!barPlaceholder.isFramed && root.barShouldShow && !barPlaceholder.isHidden) ? barPlaceholder.width : 0
212-
height: (!barPlaceholder.isFramed && root.barShouldShow && !barPlaceholder.isHidden) ? barPlaceholder.height : 0
213-
radius: Style.radiusL
214-
topLeftCorner: barPlaceholder.topLeftCornerState
215-
topRightCorner: barPlaceholder.topRightCornerState
216-
bottomLeftCorner: barPlaceholder.bottomLeftCornerState
217-
bottomRightCorner: barPlaceholder.bottomRightCornerState
218-
}
219-
220-
// ── Framed bar: full screen minus rounded hole ──
221-
Region {
222-
x: 0
223-
y: 0
224-
width: (barPlaceholder.isFramed && root.barShouldShow && !barPlaceholder.isHidden) ? root.width : 0
225-
height: (barPlaceholder.isFramed && root.barShouldShow && !barPlaceholder.isHidden) ? root.height : 0
226-
227-
Region {
228-
intersection: Intersection.Subtract
229-
x: backgroundBlur.frameHoleX
230-
y: backgroundBlur.frameHoleY
231-
width: backgroundBlur.frameHoleX2 - backgroundBlur.frameHoleX
232-
height: backgroundBlur.frameHoleY2 - backgroundBlur.frameHoleY
233-
radius: backgroundBlur.frameR
234-
}
235-
}
236-
237-
// ── Panel blur regions ──
238-
// Opening panel
239-
Region {
240-
x: backgroundBlur.panelBg ? Math.round(backgroundBlur.panelBg.x) : 0
241-
y: backgroundBlur.panelBg ? Math.round(backgroundBlur.panelBg.y) : 0
242-
width: backgroundBlur.panelBg ? Math.round(backgroundBlur.panelBg.width) : 0
243-
height: backgroundBlur.panelBg ? Math.round(backgroundBlur.panelBg.height) : 0
244-
radius: Style.radiusL
245-
topLeftCorner: backgroundBlur.panelBg ? backgroundBlur.panelBg.topLeftCornerState : CornerState.Normal
246-
topRightCorner: backgroundBlur.panelBg ? backgroundBlur.panelBg.topRightCornerState : CornerState.Normal
247-
bottomLeftCorner: backgroundBlur.panelBg ? backgroundBlur.panelBg.bottomLeftCornerState : CornerState.Normal
248-
bottomRightCorner: backgroundBlur.panelBg ? backgroundBlur.panelBg.bottomRightCornerState : CornerState.Normal
249-
}
250-
251-
// Closing panel (coexists with opening panel during transition)
252-
Region {
253-
x: backgroundBlur.closingPanelBg ? Math.round(backgroundBlur.closingPanelBg.x) : 0
254-
y: backgroundBlur.closingPanelBg ? Math.round(backgroundBlur.closingPanelBg.y) : 0
255-
width: backgroundBlur.closingPanelBg ? Math.round(backgroundBlur.closingPanelBg.width) : 0
256-
height: backgroundBlur.closingPanelBg ? Math.round(backgroundBlur.closingPanelBg.height) : 0
257-
radius: Style.radiusL
258-
topLeftCorner: backgroundBlur.closingPanelBg ? backgroundBlur.closingPanelBg.topLeftCornerState : CornerState.Normal
259-
topRightCorner: backgroundBlur.closingPanelBg ? backgroundBlur.closingPanelBg.topRightCornerState : CornerState.Normal
260-
bottomLeftCorner: backgroundBlur.closingPanelBg ? backgroundBlur.closingPanelBg.bottomLeftCornerState : CornerState.Normal
261-
bottomRightCorner: backgroundBlur.closingPanelBg ? backgroundBlur.closingPanelBg.bottomRightCornerState : CornerState.Normal
262-
}
263-
}
206+
// BackgroundEffect.blurRegion: Region {
207+
// // ── Non-framed bar (simple/floating): single rectangle with bar corner states ──
208+
// Region {
209+
// x: (!barPlaceholder.isFramed && root.barShouldShow && !barPlaceholder.isHidden) ? barPlaceholder.x : 0
210+
// y: (!barPlaceholder.isFramed && root.barShouldShow && !barPlaceholder.isHidden) ? barPlaceholder.y : 0
211+
// width: (!barPlaceholder.isFramed && root.barShouldShow && !barPlaceholder.isHidden) ? barPlaceholder.width : 0
212+
// height: (!barPlaceholder.isFramed && root.barShouldShow && !barPlaceholder.isHidden) ? barPlaceholder.height : 0
213+
// radius: Style.radiusL
214+
// topLeftCorner: barPlaceholder.topLeftCornerState
215+
// topRightCorner: barPlaceholder.topRightCornerState
216+
// bottomLeftCorner: barPlaceholder.bottomLeftCornerState
217+
// bottomRightCorner: barPlaceholder.bottomRightCornerState
218+
// }
219+
220+
// // ── Framed bar: full screen minus rounded hole ──
221+
// Region {
222+
// x: 0
223+
// y: 0
224+
// width: (barPlaceholder.isFramed && root.barShouldShow && !barPlaceholder.isHidden) ? root.width : 0
225+
// height: (barPlaceholder.isFramed && root.barShouldShow && !barPlaceholder.isHidden) ? root.height : 0
226+
227+
// Region {
228+
// intersection: Intersection.Subtract
229+
// x: backgroundBlur.frameHoleX
230+
// y: backgroundBlur.frameHoleY
231+
// width: backgroundBlur.frameHoleX2 - backgroundBlur.frameHoleX
232+
// height: backgroundBlur.frameHoleY2 - backgroundBlur.frameHoleY
233+
// radius: backgroundBlur.frameR
234+
// }
235+
// }
236+
237+
// // ── Panel blur regions ──
238+
// // Opening panel
239+
// Region {
240+
// x: backgroundBlur.panelBg ? Math.round(backgroundBlur.panelBg.x) : 0
241+
// y: backgroundBlur.panelBg ? Math.round(backgroundBlur.panelBg.y) : 0
242+
// width: backgroundBlur.panelBg ? Math.round(backgroundBlur.panelBg.width) : 0
243+
// height: backgroundBlur.panelBg ? Math.round(backgroundBlur.panelBg.height) : 0
244+
// radius: Style.radiusL
245+
// topLeftCorner: backgroundBlur.panelBg ? backgroundBlur.panelBg.topLeftCornerState : CornerState.Normal
246+
// topRightCorner: backgroundBlur.panelBg ? backgroundBlur.panelBg.topRightCornerState : CornerState.Normal
247+
// bottomLeftCorner: backgroundBlur.panelBg ? backgroundBlur.panelBg.bottomLeftCornerState : CornerState.Normal
248+
// bottomRightCorner: backgroundBlur.panelBg ? backgroundBlur.panelBg.bottomRightCornerState : CornerState.Normal
249+
// }
250+
251+
// // Closing panel (coexists with opening panel during transition)
252+
// Region {
253+
// x: backgroundBlur.closingPanelBg ? Math.round(backgroundBlur.closingPanelBg.x) : 0
254+
// y: backgroundBlur.closingPanelBg ? Math.round(backgroundBlur.closingPanelBg.y) : 0
255+
// width: backgroundBlur.closingPanelBg ? Math.round(backgroundBlur.closingPanelBg.width) : 0
256+
// height: backgroundBlur.closingPanelBg ? Math.round(backgroundBlur.closingPanelBg.height) : 0
257+
// radius: Style.radiusL
258+
// topLeftCorner: backgroundBlur.closingPanelBg ? backgroundBlur.closingPanelBg.topLeftCornerState : CornerState.Normal
259+
// topRightCorner: backgroundBlur.closingPanelBg ? backgroundBlur.closingPanelBg.topRightCornerState : CornerState.Normal
260+
// bottomLeftCorner: backgroundBlur.closingPanelBg ? backgroundBlur.closingPanelBg.bottomLeftCornerState : CornerState.Normal
261+
// bottomRightCorner: backgroundBlur.closingPanelBg ? backgroundBlur.closingPanelBg.bottomRightCornerState : CornerState.Normal
262+
// }
263+
// }
264264

265265
// --------------------------------------
266266
// Container for all UI elements
@@ -548,35 +548,35 @@ PanelWindow {
548548

549549
// Blur behind the bar and open panels
550550
// Helper object holding computed properties for blur regions
551-
QtObject {
552-
id: backgroundBlur
553-
554-
// Panel background geometry (from the currently open panel on this screen)
555-
readonly property var panelBg: {
556-
var op = PanelService.openedPanel;
557-
if (!op || op.screen !== root.screen || op.blurEnabled === false)
558-
return null;
559-
var region = op.panelRegion;
560-
return (region && region.visible) ? region.panelItem : null;
561-
}
562-
563-
// Panel background geometry for the closing panel (may coexist with panelBg)
564-
readonly property var closingPanelBg: {
565-
var cp = PanelService.closingPanel;
566-
if (!cp || cp.screen !== root.screen || cp.blurEnabled === false)
567-
return null;
568-
var region = cp.panelRegion;
569-
return (region && region.visible) ? region.panelItem : null;
570-
}
571-
572-
// Framed bar: inner hole boundary (where the hole begins on each axis)
573-
// These are the x/y coordinates of the 4 inner hole corners
574-
readonly property real frameHoleX: barPlaceholder.barPosition === "left" ? barPlaceholder.barHeight : barPlaceholder.frameThickness
575-
readonly property real frameHoleY: barPlaceholder.barPosition === "top" ? barPlaceholder.barHeight : barPlaceholder.frameThickness
576-
readonly property real frameHoleX2: root.width - (barPlaceholder.barPosition === "right" ? barPlaceholder.barHeight : barPlaceholder.frameThickness)
577-
readonly property real frameHoleY2: root.height - (barPlaceholder.barPosition === "bottom" ? barPlaceholder.barHeight : barPlaceholder.frameThickness)
578-
readonly property real frameR: Settings.data.bar.frameRadius ?? 20
579-
}
551+
// QtObject {
552+
// id: backgroundBlur
553+
554+
// // Panel background geometry (from the currently open panel on this screen)
555+
// readonly property var panelBg: {
556+
// var op = PanelService.openedPanel;
557+
// if (!op || op.screen !== root.screen || op.blurEnabled === false)
558+
// return null;
559+
// var region = op.panelRegion;
560+
// return (region && region.visible) ? region.panelItem : null;
561+
// }
562+
563+
// // Panel background geometry for the closing panel (may coexist with panelBg)
564+
// readonly property var closingPanelBg: {
565+
// var cp = PanelService.closingPanel;
566+
// if (!cp || cp.screen !== root.screen || cp.blurEnabled === false)
567+
// return null;
568+
// var region = cp.panelRegion;
569+
// return (region && region.visible) ? region.panelItem : null;
570+
// }
571+
572+
// // Framed bar: inner hole boundary (where the hole begins on each axis)
573+
// // These are the x/y coordinates of the 4 inner hole corners
574+
// readonly property real frameHoleX: barPlaceholder.barPosition === "left" ? barPlaceholder.barHeight : barPlaceholder.frameThickness
575+
// readonly property real frameHoleY: barPlaceholder.barPosition === "top" ? barPlaceholder.barHeight : barPlaceholder.frameThickness
576+
// readonly property real frameHoleX2: root.width - (barPlaceholder.barPosition === "right" ? barPlaceholder.barHeight : barPlaceholder.frameThickness)
577+
// readonly property real frameHoleY2: root.height - (barPlaceholder.barPosition === "bottom" ? barPlaceholder.barHeight : barPlaceholder.frameThickness)
578+
// readonly property real frameR: Settings.data.bar.frameRadius ?? 20
579+
// }
580580

581581
// Native idle inhibitor — one per active MainScreen window.
582582
// Multiple inhibitors bound to the same enabled state are harmless;

Services/Noctalia/UpdateService.qml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Singleton {
1212

1313
// Version properties
1414
readonly property string baseVersion: "4.6.1"
15-
readonly property bool isDevelopment: true
15+
readonly property bool isDevelopment: false
1616
readonly property string developmentSuffix: "-git"
1717
readonly property string currentVersion: `v${!isDevelopment ? baseVersion : baseVersion + developmentSuffix}`
1818

0 commit comments

Comments
 (0)