3 ➡️ 4 fixes

Signed-off-by: Louise Poubel <[email protected]>
gazebosim · Aug 7, 2020 · 2a1e2a5 · 2a1e2a5
1 parent 58fb2ad
commit 2a1e2a5
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/.github/ci/packages.apt b/.github/ci/packages.apt
@@ -1,21 +1,24 @@
 libignition-cmake2-dev
 libignition-common3-dev
 libignition-math6-dev
-libignition-msgs5-dev
+libignition-msgs6-dev
 libignition-plugin-dev
-libignition-rendering3-dev
+libignition-rendering4-dev
 libignition-tools-dev
-libignition-transport8-dev
+libignition-transport9-dev
 libprotobuf-dev
 libprotoc-dev
 libtinyxml2-dev
 qml-module-qt-labs-folderlistmodel
 qml-module-qt-labs-settings
 qml-module-qtgraphicaleffects
+qml-module-qtqml-models2
 qml-module-qtquick-controls
 qml-module-qtquick-controls2
 qml-module-qtquick-dialogs
 qml-module-qtquick-layouts
+qml-module-qtquick-templates2
+qml-module-qtquick-window2
 qml-module-qtquick2
 qtbase5-dev
 qtdeclarative5-dev

diff --git a/include/ignition/gui/qml/IgnCard.qml b/include/ignition/gui/qml/IgnCard.qml
@@ -115,6 +115,7 @@ Pane {
  * Tool bar background color
  */
  property string pluginToolBarColor:
+ typeof MainWindow === "undefined" ||
  MainWindow.pluginToolBarColorLight === "" ||
  MainWindow.pluginToolBarColorDark === "" ?
  Material.accent :
@@ -125,6 +126,7 @@ Pane {
  * Tool bar text color
  */
  property string pluginToolBarTextColor:
+ typeof MainWindow === "undefined" ||
  MainWindow.pluginToolBarTextColorLight === "" ||
  MainWindow.pluginToolBarTextColorDark === "" ?
  Material.background :

diff --git a/src/plugins/key_publisher/KeyPublisher.hh b/src/plugins/key_publisher/KeyPublisher.hh
@@ -19,6 +19,9 @@
 #define IGNITION_GUI_PLUGINS_KEYPUBLISHER_HH_
 
 #include <ignition/gui/qt.h>
+
+#include <memory>
+
 #include <ignition/gui/Plugin.hh>
 #include <ignition/transport/Node.hh>
 

diff --git a/src/plugins/topic_echo/TopicEcho.qml b/src/plugins/topic_echo/TopicEcho.qml
@@ -84,8 +84,8 @@ Rectangle {
  }
 
  Rectangle {
- width: topicEcho.parent.width - 20
- height: topicEcho.parent.height - 200
+ width: topicEcho.parent !== null ? topicEcho.parent.width - 20 : 50
+ height: topicEcho.parent !== null ? topicEcho.parent.height - 200 : 50
  color: "transparent"
 
  ListView {