mirror of
https://github.com/AvengeMedia/DankMaterialShell.git
synced 2026-05-10 22:39:37 -04:00
fix(Settings): Update card registration logic to fix binded crash
This commit is contained in:
@@ -33,9 +33,14 @@ Item {
|
||||
Component.onCompleted: {
|
||||
if (!settingKey)
|
||||
return;
|
||||
let flickable = findParentFlickable();
|
||||
if (flickable)
|
||||
SettingsSearchService.registerCard(settingKey, root, flickable);
|
||||
var key = settingKey;
|
||||
Qt.callLater(() => {
|
||||
if (!root.parent)
|
||||
return;
|
||||
var flickable = findParentFlickable();
|
||||
if (flickable)
|
||||
SettingsSearchService.registerCard(key, root, flickable);
|
||||
});
|
||||
}
|
||||
|
||||
Component.onDestruction: {
|
||||
|
||||
@@ -55,12 +55,16 @@ StyledRect {
|
||||
}
|
||||
|
||||
Component.onCompleted: {
|
||||
if (settingKey) {
|
||||
let flickable = findParentFlickable();
|
||||
if (flickable) {
|
||||
SettingsSearchService.registerCard(settingKey, root, flickable);
|
||||
}
|
||||
}
|
||||
if (!settingKey)
|
||||
return;
|
||||
var key = settingKey;
|
||||
Qt.callLater(() => {
|
||||
if (!root.parent)
|
||||
return;
|
||||
var flickable = findParentFlickable();
|
||||
if (flickable)
|
||||
SettingsSearchService.registerCard(key, root, flickable);
|
||||
});
|
||||
}
|
||||
|
||||
Component.onDestruction: {
|
||||
|
||||
@@ -48,9 +48,14 @@ DankDropdown {
|
||||
Component.onCompleted: {
|
||||
if (!settingKey)
|
||||
return;
|
||||
let flickable = findParentFlickable();
|
||||
if (flickable)
|
||||
SettingsSearchService.registerCard(settingKey, root, flickable);
|
||||
var key = settingKey;
|
||||
Qt.callLater(() => {
|
||||
if (!root.parent)
|
||||
return;
|
||||
var flickable = findParentFlickable();
|
||||
if (flickable)
|
||||
SettingsSearchService.registerCard(key, root, flickable);
|
||||
});
|
||||
}
|
||||
|
||||
Component.onDestruction: {
|
||||
|
||||
@@ -33,9 +33,14 @@ Item {
|
||||
Component.onCompleted: {
|
||||
if (!settingKey)
|
||||
return;
|
||||
let flickable = findParentFlickable();
|
||||
if (flickable)
|
||||
SettingsSearchService.registerCard(settingKey, root, flickable);
|
||||
var key = settingKey;
|
||||
Qt.callLater(() => {
|
||||
if (!root.parent)
|
||||
return;
|
||||
var flickable = findParentFlickable();
|
||||
if (flickable)
|
||||
SettingsSearchService.registerCard(key, root, flickable);
|
||||
});
|
||||
}
|
||||
|
||||
Component.onDestruction: {
|
||||
|
||||
@@ -32,9 +32,14 @@ DankToggle {
|
||||
Component.onCompleted: {
|
||||
if (!settingKey)
|
||||
return;
|
||||
let flickable = findParentFlickable();
|
||||
if (flickable)
|
||||
SettingsSearchService.registerCard(settingKey, root, flickable);
|
||||
var key = settingKey;
|
||||
Qt.callLater(() => {
|
||||
if (!root.parent)
|
||||
return;
|
||||
var flickable = findParentFlickable();
|
||||
if (flickable)
|
||||
SettingsSearchService.registerCard(key, root, flickable);
|
||||
});
|
||||
}
|
||||
|
||||
Component.onDestruction: {
|
||||
|
||||
@@ -54,10 +54,12 @@ Singleton {
|
||||
function registerCard(settingKey, item, flickable) {
|
||||
if (!settingKey)
|
||||
return;
|
||||
registeredCards[settingKey] = {
|
||||
var cards = Object.assign({}, registeredCards);
|
||||
cards[settingKey] = {
|
||||
item: item,
|
||||
flickable: flickable
|
||||
};
|
||||
registeredCards = cards;
|
||||
if (targetSection === settingKey)
|
||||
scrollTimer.restart();
|
||||
}
|
||||
@@ -65,7 +67,7 @@ Singleton {
|
||||
function unregisterCard(settingKey) {
|
||||
if (!settingKey)
|
||||
return;
|
||||
let cards = registeredCards;
|
||||
var cards = Object.assign({}, registeredCards);
|
||||
delete cards[settingKey];
|
||||
registeredCards = cards;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user