diff options
| author |   wang_zhiqiang <wang_zhiqiang@dl.cn.nexty-ele.com> | 2018-11-19 18:13:53 +0800 |
|---|---|---|
| committer | wang_zhiqiang <wang_zhiqiang@dl.cn.nexty-ele.com> | 2018-11-19 18:13:53 +0800 |
| commit | da8d7c1291e930778853eb9f241054abf9c633ee (patch) | |
| tree | f52c7a227d9202cb3ce90432f95f1aae5a08ff7a | |
| parent | b3476f1c2debc23411a66b1498065ab575879e22 (diff) | |
change bg image opacity, add check icon conditionsandbox/wangzhiqiang/new_verbs
Change-Id: I941f8aa2c14911af68c169377ad511562f369070
| -rw-r--r-- | homescreen/qml/images/AGL_HMI_Blue_Background_NoCar-01.png | bin | 949053 -> 951359 bytes | |||
| -rw-r--r-- | homescreen/qml/main.qml | 8 | ||||
| -rw-r--r-- | homescreen/src/homescreenhandler.cpp | 2 |
3 files changed, 3 insertions, 7 deletions
diff --git a/homescreen/qml/images/AGL_HMI_Blue_Background_NoCar-01.png b/homescreen/qml/images/AGL_HMI_Blue_Background_NoCar-01.png Binary files differindex 357c204..a4e026c 100644 --- a/homescreen/qml/images/AGL_HMI_Blue_Background_NoCar-01.png +++ b/homescreen/qml/images/AGL_HMI_Blue_Background_NoCar-01.png diff --git a/homescreen/qml/main.qml b/homescreen/qml/main.qml index 164cbf7..24ee262 100644 --- a/homescreen/qml/main.qml +++ b/homescreen/qml/main.qml @@ -136,18 +136,14 @@ Window { container.state = 'fullscreen' touchArea.switchArea(1) homescreenHandler.tapShortcut(appName, true) - if (appName === 'navigation' || appName === 'browser') { - container.opacity = 0.0 - } + container.opacity = 0.0 } else { image.source = './images/normal.png' btnState = 'normal' container.state = 'normal' touchArea.switchArea(0) homescreenHandler.tapShortcut(appName, false) - if (appName === 'navigation' || appName === 'browser') { - container.opacity = 1.0 - } + container.opacity = 1.0 } } } diff --git a/homescreen/src/homescreenhandler.cpp b/homescreen/src/homescreenhandler.cpp index 2d51099..32eabd1 100644 --- a/homescreen/src/homescreenhandler.cpp +++ b/homescreen/src/homescreenhandler.cpp @@ -60,7 +60,7 @@ void HomescreenHandler::init(int port, const char *token) json_object_object_get(p_obj, "text")); QFileInfo icon_file(icon); QString icon_path; - if (icon_file.exists()) { + if (icon_file.isFile() && icon_file.exists()) { icon_path = QString(QLatin1String(icon)); } else { icon_path = "./images/Utility_Logo_Grey-01.svg"; |
