Commit de8ca630 authored by Ronan Abhamon's avatar Ronan Abhamon

fix(ui/modules/Common/Popup/DesktopPopup.qml): `requestActivate` is now an optional parameter

parent b9c1e7da
...@@ -12,7 +12,7 @@ Item { ...@@ -12,7 +12,7 @@ Item {
property alias popupX: popup.x property alias popupX: popup.x
property alias popupY: popup.y property alias popupY: popup.y
property bool requestActivate: false
property int flags: Qt.SplashScreen property int flags: Qt.SplashScreen
readonly property alias popupWidth: popup.width readonly property alias popupWidth: popup.width
...@@ -79,7 +79,10 @@ Item { ...@@ -79,7 +79,10 @@ Item {
ScriptAction { ScriptAction {
script: { script: {
popup.showNormal() popup.showNormal()
popup.requestActivate()
if (wrapper.requestActivate) {
popup.requestActivate()
}
} }
} }
......
...@@ -97,6 +97,7 @@ Item { ...@@ -97,6 +97,7 @@ Item {
popupX: coords.x popupX: coords.x
popupY: coords.y popupY: coords.y
requestActivate: true
onVisibleChanged: !visible && searchBox.hideMenu() onVisibleChanged: !visible && searchBox.hideMenu()
......
...@@ -62,7 +62,7 @@ ApplicationWindow { ...@@ -62,7 +62,7 @@ ApplicationWindow {
} }
function _setView (view, props) { function _setView (view, props) {
window.showNormal() //window.show()
window.requestActivate() window.requestActivate()
collapse.setCollapsed(true) collapse.setCollapsed(true)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment