diff --git a/modules/dashboard/Content.qml b/modules/dashboard/Content.qml index 807664c9..d149a1ac 100644 --- a/modules/dashboard/Content.qml +++ b/modules/dashboard/Content.qml @@ -12,15 +12,6 @@ Item { id: root required property DrawerVisibilities visibilities - readonly property bool needsKeyboard: { - const count = repeater.count; - for (let i = 0; i < count; i++) { - const item = repeater.itemAt(i) as Loader; - if (item?.sourceComponent === mediaComponent && (item?.item as Media)?.needsKeyboard) - return true; - } - return false; - } required property DashboardState dashState required property FileDialog facePicker diff --git a/modules/dashboard/Media.qml b/modules/dashboard/Media.qml index 9bdc60c3..2a2f5c2e 100644 --- a/modules/dashboard/Media.qml +++ b/modules/dashboard/Media.qml @@ -10,7 +10,6 @@ Item { id: root required property DrawerVisibilities visibilities - readonly property bool needsKeyboard: false // TODO implicitWidth: Tokens.sizes.dashboard.mediaTabWidth implicitHeight: Tokens.sizes.dashboard.mediaTabHeight diff --git a/modules/dashboard/Wrapper.qml b/modules/dashboard/Wrapper.qml index 09083ff3..1239f5b7 100644 --- a/modules/dashboard/Wrapper.qml +++ b/modules/dashboard/Wrapper.qml @@ -12,7 +12,6 @@ Item { id: root required property DrawerVisibilities visibilities - readonly property bool needsKeyboard: (content.item as Content)?.needsKeyboard ?? false readonly property DashboardState dashState: DashboardState { reloadableId: "dashboardState" } diff --git a/modules/drawers/ContentWindow.qml b/modules/drawers/ContentWindow.qml index c76bafff..cc1bccd5 100644 --- a/modules/drawers/ContentWindow.qml +++ b/modules/drawers/ContentWindow.qml @@ -63,7 +63,7 @@ StyledWindow { name: "drawers" WlrLayershell.exclusionMode: ExclusionMode.Ignore WlrLayershell.layer: fsTransitionProg > 0 && contentItem.Config.general.showOverFullscreen ? WlrLayer.Overlay : WlrLayer.Top - WlrLayershell.keyboardFocus: visibilities.launcher || visibilities.session || panels.dashboard.needsKeyboard ? WlrKeyboardFocus.OnDemand : WlrKeyboardFocus.None + WlrLayershell.keyboardFocus: visibilities.launcher || visibilities.session ? WlrKeyboardFocus.OnDemand : WlrKeyboardFocus.None mask: hasFullscreen ? emptyRegion : regions