status-im
/
status-desktop
mirror of https://github.com/status-im/status-desktop.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(warnings): Fix warnings from AppMain and main on start 

Fixes: #8293
This commit is contained in:
Boris Melnik 2022-12-09 14:35:29 +03:00
parent 46b0a82001
commit 0ff0047167
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ui/app/mainui/AppMain.qml
View File

@ -639,6 +639,8 @@ Item {
result += "</a>" result += "</a>"
return result return result
} }
return ""
} }
onLinkActivated: Global.openPopup(communitiesPortalLayoutContainer.discordImportProgressPopup) onLinkActivated: Global.openPopup(communitiesPortalLayoutContainer.discordImportProgressPopup)
progressValue: progress progressValue: progress
@ -1339,10 +1341,19 @@ Item {
} }
} }
Connections {
target: appMain.rootStore.mainModuleInst
function onActiveSectionChanged() {
rootDropAreaPanel.activeChatType = appMain.rootStore.mainModuleInst.getCommunitySectionModule().activeItem.type
}
}
DropAreaPanel { DropAreaPanel {
id: rootDropAreaPanel
width: appMain.width width: appMain.width
height: appMain.height height: appMain.height
activeChatType: chatCommunitySectionModule && chatCommunitySectionModule.activeItem.type activeChatType: appMain.rootStore.mainModuleInst.getCommunitySectionModule() ? appMain.rootStore.mainModuleInst.getCommunitySectionModule().activeItem.type
: 0
enabled: !drag.source && ( enabled: !drag.source && (
// in chat view // in chat view
(appMain.rootStore.mainModuleInst.activeSection.sectionType === Constants.appSection.chat && (appMain.rootStore.mainModuleInst.activeSection.sectionType === Constants.appSection.chat &&

2
ui/main.qml
View File

@ -110,7 +110,7 @@ StatusWindow {
Action { Action {
shortcut: "Ctrl+W" shortcut: "Ctrl+W"
enabled: loader.item && !!loader.item.appLayout? loader.item.appLayout.appView.currentIndex === Constants.appViewStackIndex.browser enabled: loader.item && !!loader.item.appLayout && loader.item.appLayout.appView ? loader.item.appLayout.appView.currentIndex === Constants.appViewStackIndex.browser
: true : true
onTriggered: { onTriggered: {
applicationWindow.visible = false; applicationWindow.visible = false;