aboutsummaryrefslogtreecommitdiffstats
path: root/imports_shared
diff options
context:
space:
mode:
authorGrigorii Zimin <gzimin@luxoft.com>2019-09-05 18:05:34 +0300
committerGrigorii Zimin <gzimin@luxoft.com>2019-09-20 04:02:39 +0000
commitd36fe31e5d08b7e919b9acc500f877adc9ce9d03 (patch)
tree65b4d3af70172b676cafdae45d3531f74e789df5 /imports_shared
parent3099f4a49a3269905b9bc956fe45b687bacfe887 (diff)
[vehicle] extend and restore previous fix for SP mode
- This bug was initially fixed in AUTOSUITE-715, but setting "visible" property for windowItem instead of window itself has no effect because of the following destroy call, in the destruction process window parentItem is set to nullptr and this change restore visible property to true (see setParentItem method in QQuickItem) - The visible property can't be explicitly set for window on the Neptune UI 3 side, but it is also shouldn't be set on the appman side because apps can have visible set false by default - This commit will fix only SP mode bug when you go to another app and return back (IMPORTANT: 3D Scene should be already loaded) - Bug with segfault on apps' changing during the scene load process wont be fixed with this commit Task-number: AUTOSUITE-1206 Change-Id: Ia2c3fd79a15d4381e236876b35a095a27a54765c Reviewed-by: Bramastyo Harimukti Santoso <bramastyo.harimukti.santoso@pelagicore.com>
Diffstat (limited to 'imports_shared')
-rw-r--r--imports_shared/application/windows/ApplicationCCWindow.qml7
1 files changed, 5 insertions, 2 deletions
diff --git a/imports_shared/application/windows/ApplicationCCWindow.qml b/imports_shared/application/windows/ApplicationCCWindow.qml
index 31a1682f..ef604620 100644
--- a/imports_shared/application/windows/ApplicationCCWindow.qml
+++ b/imports_shared/application/windows/ApplicationCCWindow.qml
@@ -110,7 +110,7 @@ NeptuneWindow {
/*!
\qmlproperty string ApplicationCCWindow::neptuneState
This property holds the current state of the application. The valid values for neptuneState are
- (Maximized, Widget1Row, Widget2Rows or Widget3Rows)
+ (Maximized, Minimized, Widget1Row, Widget2Rows or Widget3Rows)
*/
property string neptuneState
@@ -125,6 +125,7 @@ NeptuneWindow {
property int currentWidth: 0
property int exposedRectHeight: Math.min(root.currentHeight, root.height - exposedRectBottomMargin - exposedRectTopMargin);
property int activationCount: 0
+ property var validNeptuneStates: ["Maximized", "Minimized", "Widget1Row", "Widget2Rows", "Widget3Rows"]
}
function riseWindow() {
@@ -149,7 +150,9 @@ NeptuneWindow {
root.currentHeight = value;
break;
case "neptuneState":
- root.neptuneState = value;
+ if (d.validNeptuneStates.includes(value)) {
+ root.neptuneState = value;
+ }
break;
case "performanceMonitorEnabled":
monitorOverlay.fpsVisible = value;