diff --git a/components/InputDialog.qml b/components/InputDialog.qml index fd1c3e3d..e51a16db 100644 --- a/components/InputDialog.qml +++ b/components/InputDialog.qml @@ -65,7 +65,7 @@ Item { } ColumnLayout { - z: bg.z + 1 + z: parent.z + 1 id: mainLayout spacing: 10 anchors { fill: parent; margins: 35 } diff --git a/js/Windows.js b/js/Windows.js index be2f503e..435a91de 100644 --- a/js/Windows.js +++ b/js/Windows.js @@ -11,12 +11,11 @@ function setCustomWindowDecorations(custom) { var y = appWindow.y if (x < 0) x = 0 if (y < 0) y = 0 - + // Update persistentSettings persistentSettings.customDecorations = custom; titleBar.visible = custom; - daemonConsolePopup.titleBar.visible = custom; if (custom) { appWindow.flags = flagsCustomDecorations; @@ -25,7 +24,7 @@ function setCustomWindowDecorations(custom) { appWindow.flags = flags; daemonConsolePopup.flags = flags; } - + // Reset window appWindow.hide() appWindow.x = x diff --git a/pages/settings/SettingsLog.qml b/pages/settings/SettingsLog.qml index 61b54901..99ba0b95 100644 --- a/pages/settings/SettingsLog.qml +++ b/pages/settings/SettingsLog.qml @@ -11,7 +11,7 @@ Rectangle { color: "transparent" height: 1400 Layout.fillWidth: true - + ColumnLayout { id: settingsLog property int itemHeight: 60 * scaleRatio @@ -31,7 +31,7 @@ Rectangle { // color: MoneroComponents.Style.dividerColor // opacity: MoneroComponents.Style.dividerOpacity // } - + Text { Layout.bottomMargin: 2 * scaleRatio color: MoneroComponents.Style.defaultFontColor @@ -191,7 +191,6 @@ Rectangle { id: sendCommandText Layout.fillWidth: true fontBold: false - fontFamily: MoneroComponents.Style.fontRegular.name placeholderText: qsTr("command + enter (e.g help)") + translationManager.emptyString placeholderFontSize: 16 * scaleRatio onAccepted: { @@ -207,7 +206,7 @@ Rectangle { Component.onCompleted: { logLevelDropdown.currentIndex = persistentSettings.logLevel; logLevelDropdown.update(); - + if(typeof daemonManager != "undefined") daemonManager.daemonConsoleUpdated.connect(onDaemonConsoleUpdated) }