parent
dfcba80df2
commit
f7294c00f5
|
@ -228,10 +228,10 @@ StatusSectionLayout {
|
|||
dappBrowserAccIcon: WalletStore.dappBrowserAccount.color
|
||||
settingMenu: settingsMenu
|
||||
walletMenu: browserWalletMenu
|
||||
currentUrl: _internal.currentWebView.url
|
||||
isLoading: _internal.currentWebView.loading
|
||||
canGoBack: _internal.currentWebView.canGoBack
|
||||
canGoForward: _internal.currentWebView.canGoForward
|
||||
currentUrl: !!_internal.currentWebView ? _internal.currentWebView.url : ""
|
||||
isLoading: (!!_internal.currentWebView && _internal.currentWebView.loading)
|
||||
canGoBack: (!!_internal.currentWebView && _internal.currentWebView.canGoBack)
|
||||
canGoForward: (!!_internal.currentWebView && _internal.currentWebView.canGoForward)
|
||||
currentTabConnected: RootStore.currentTabConnected
|
||||
onOpenHistoryPopup: historyMenu.popup(xPos, yPos)
|
||||
onGoBack: _internal.currentWebView.goBack()
|
||||
|
@ -274,7 +274,7 @@ StatusSectionLayout {
|
|||
anchors.left: parent.left
|
||||
anchors.right: parent.right
|
||||
z: 50
|
||||
tabComponent: webEngineView
|
||||
tabComponent: !!webEngineView ? webEngineView : null
|
||||
currentWebEngineProfile: _internal.currentWebView.profile
|
||||
determineRealURL: function(url) {
|
||||
return _internal.determineRealURL(url)
|
||||
|
|
|
@ -29,7 +29,8 @@ Item {
|
|||
ColumnLayout {
|
||||
id: layout
|
||||
|
||||
anchors.fill: parent
|
||||
implicitWidth: childrenRect.width
|
||||
implicitHeight: childrenRect.height
|
||||
|
||||
spacing: 8
|
||||
|
||||
|
|
|
@ -285,7 +285,8 @@ Item {
|
|||
filters: [
|
||||
ExpressionFilter {
|
||||
expression: {
|
||||
if (!root.startupStore.selectedLoginAccount.keycardCreatedAccount &&
|
||||
if (!!root.startupStore.selectedLoginAccount &&
|
||||
!root.startupStore.selectedLoginAccount.keycardCreatedAccount &&
|
||||
model.username === d.lostKeycardItemKey) {
|
||||
return false
|
||||
}
|
||||
|
|
|
@ -78,7 +78,7 @@ StatusSectionLayout {
|
|||
currentIndex: Global.settingsSubsection
|
||||
|
||||
onCurrentIndexChanged: {
|
||||
if (!children[currentIndex].active)
|
||||
if (!!children[currentIndex] && !children[currentIndex].active)
|
||||
children[currentIndex].active = true
|
||||
|
||||
root.store.backButtonName = ""
|
||||
|
@ -285,6 +285,8 @@ StatusSectionLayout {
|
|||
Loader {
|
||||
active: false
|
||||
asynchronous: true
|
||||
Layout.fillWidth: true
|
||||
Layout.fillHeight: true
|
||||
sourceComponent: CommunitiesView {
|
||||
implicitWidth: parent.width
|
||||
implicitHeight: parent.height
|
||||
|
|
|
@ -39,7 +39,7 @@ SettingsContentBase {
|
|||
|
||||
Item {
|
||||
id: appearanceContainer
|
||||
anchors.left: parent.left
|
||||
anchors.left: !!parent ? parent.left : undefined
|
||||
anchors.leftMargin: Style.current.padding
|
||||
width: appearanceView.contentWidth - 2 * Style.current.padding
|
||||
height: childrenRect.height
|
||||
|
|
|
@ -37,8 +37,8 @@ SettingsContentBase {
|
|||
|
||||
Item {
|
||||
id: rootItem
|
||||
height: childrenRect.height
|
||||
width: root.contentWidth
|
||||
height: childrenRect.height
|
||||
|
||||
ColumnLayout {
|
||||
id: noCommunitiesLayout
|
||||
|
|
|
@ -23,7 +23,7 @@ SettingsContentBase {
|
|||
|
||||
Item {
|
||||
width: root.contentWidth
|
||||
height: parent.height
|
||||
height: !!parent ? parent.height : 0
|
||||
|
||||
Item {
|
||||
id: firstTimeSetup
|
||||
|
|
Loading…
Reference in New Issue