feat: drawing popout now clips strokes again + add redo + add undo and redo keybinds
C++ / fmt (pull_request) Failing after 6s
C++ / build (pull_request) Failing after 12s
C++ / clang-tidy (pull_request) Failing after 10s
JS/TS / fmt (pull_request) Successful in 9s
JS/TS / lint (pull_request) Successful in 9s
Python / static (pull_request) Successful in 28s
Python / verify (pull_request) Failing after 1m41s
Rust / build (pull_request) Successful in 1m15s
Rust / fmt (pull_request) Successful in 42s
Rust / clippy (pull_request) Successful in 1m6s
C++ / fmt (pull_request) Failing after 6s
C++ / build (pull_request) Failing after 12s
C++ / clang-tidy (pull_request) Failing after 10s
JS/TS / fmt (pull_request) Successful in 9s
JS/TS / lint (pull_request) Successful in 9s
Python / static (pull_request) Successful in 28s
Python / verify (pull_request) Failing after 1m41s
Rust / build (pull_request) Successful in 1m15s
Rust / fmt (pull_request) Successful in 42s
Rust / clippy (pull_request) Successful in 1m6s
This commit is contained in:
+24
-2
@@ -56,7 +56,7 @@ CustomWindow {
|
||||
property color surfaceColor: Colors.tPalette.m3surface
|
||||
|
||||
WlrLayershell.exclusionMode: ExclusionMode.Ignore
|
||||
WlrLayershell.keyboardFocus: screenState.screenshot ? WlrKeyboardFocus.Exclusive : screenState.launcher || screenState.settings || screenState.sidebar ? WlrKeyboardFocus.OnDemand : WlrKeyboardFocus.None
|
||||
WlrLayershell.keyboardFocus: screenState.screenshot ? WlrKeyboardFocus.Exclusive : screenState.launcher || screenState.settings || screenState.sidebar || screenState.isDrawing ? WlrKeyboardFocus.OnDemand : WlrKeyboardFocus.None
|
||||
WlrLayershell.layer: (fsTransitionProg > 0 && Config.general.showOverFullscreen) || (hasSpecialWorkspace && hasFullscreenOnNormalWs) ? WlrLayer.Overlay : WlrLayer.Top
|
||||
color: "transparent"
|
||||
mask: screenState.isDrawing || screenState.screenshot ? null : (hasFullscreen && !bar.isHovered ? emptyRegion : regions)
|
||||
@@ -347,12 +347,31 @@ CustomWindow {
|
||||
Drawing {
|
||||
id: drawing
|
||||
|
||||
readonly property int extraWidth: drawingBg.radius * 2
|
||||
|
||||
anchors.fill: parent
|
||||
holeRect: Qt.rect(root.borderThickness + panels.drawing.x - extraWidth, panels.drawing.y + bar.implicitHeight, panels.drawing.implicitWidth + extraWidth, panels.drawing.implicitHeight)
|
||||
holeRadius: drawingBg.radius
|
||||
screenState: root.screenState
|
||||
z: 2
|
||||
}
|
||||
|
||||
Interactions2 {
|
||||
LazyLoader {
|
||||
id: lazyLoader
|
||||
|
||||
activeAsync: root.screenState.isDrawing
|
||||
|
||||
component: DrawingInput {
|
||||
borderThickness: root.borderLayoutThickness
|
||||
drawing: drawing
|
||||
panels: panels
|
||||
screenState: root.screenState
|
||||
geometry: geometry
|
||||
parent: root.contentItem
|
||||
}
|
||||
}
|
||||
|
||||
Interactions {
|
||||
id: interactions
|
||||
|
||||
anchors.fill: parent
|
||||
@@ -365,6 +384,8 @@ CustomWindow {
|
||||
popouts: panels.popouts
|
||||
screen: root.screen
|
||||
screenState: root.screenState
|
||||
input: lazyLoader.item
|
||||
z: 1
|
||||
|
||||
Panels {
|
||||
id: panels
|
||||
@@ -442,6 +463,7 @@ CustomWindow {
|
||||
parent: root.contentItem
|
||||
screen: root.screen
|
||||
screenState: root.screenState
|
||||
z: 4
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user