mirror of
https://github.com/AvengeMedia/DankMaterialShell.git
synced 2026-04-07 14:22:07 -04:00
launcher: remove double loader
This commit is contained in:
@@ -402,7 +402,6 @@ Item {
|
||||
sourceComponent: LauncherContent {
|
||||
focus: true
|
||||
parentModal: root
|
||||
heavyContentActive: !SettingsData.dankLauncherV2UnloadOnClose || spotlightOpen || isClosing
|
||||
}
|
||||
|
||||
onLoaded: {
|
||||
|
||||
@@ -12,11 +12,10 @@ FocusScope {
|
||||
LayoutMirroring.childrenInherit: true
|
||||
|
||||
property var parentModal: null
|
||||
property bool heavyContentActive: true
|
||||
property string viewModeContext: "spotlight"
|
||||
property alias searchField: searchField
|
||||
property alias controller: controller
|
||||
property var resultsList: resultsLoader.item
|
||||
property alias resultsList: resultsList
|
||||
property alias actionPanel: actionPanel
|
||||
|
||||
property bool editMode: false
|
||||
@@ -24,8 +23,7 @@ FocusScope {
|
||||
property string editAppId: ""
|
||||
|
||||
function resetScroll() {
|
||||
if (resultsList)
|
||||
resultsList.resetScroll();
|
||||
resultsList.resetScroll();
|
||||
}
|
||||
|
||||
function focusSearchField() {
|
||||
@@ -224,7 +222,7 @@ FocusScope {
|
||||
return;
|
||||
case Qt.Key_Menu:
|
||||
case Qt.Key_F10:
|
||||
if (resultsList && contextMenu.hasContextMenuActions(controller.selectedItem)) {
|
||||
if (contextMenu.hasContextMenuActions(controller.selectedItem)) {
|
||||
var scenePos = resultsList.getSelectedItemPosition();
|
||||
var localPos = root.mapFromItem(null, scenePos.x, scenePos.y);
|
||||
showContextMenu(controller.selectedItem, localPos.x, localPos.y, true);
|
||||
@@ -553,15 +551,14 @@ FocusScope {
|
||||
}
|
||||
}
|
||||
|
||||
Loader {
|
||||
id: resultsLoader
|
||||
Item {
|
||||
width: parent.width
|
||||
height: parent.height - searchField.height - categoryRow.height - actionPanel.height - Theme.spacingXS * (categoryRow.visible ? 3 : 2)
|
||||
active: root.heavyContentActive
|
||||
asynchronous: false
|
||||
opacity: root.parentModal?.isClosing ? 0 : 1
|
||||
|
||||
sourceComponent: ResultsList {
|
||||
ResultsList {
|
||||
id: resultsList
|
||||
anchors.fill: parent
|
||||
controller: root.controller
|
||||
|
||||
onItemRightClicked: (index, item, sceneX, sceneY) => {
|
||||
|
||||
Reference in New Issue
Block a user