diff --git a/include/gz/gui/qml/GzCard.qml b/include/gz/gui/qml/GzCard.qml index bd940c64f..4d18f11c3 100644 --- a/include/gz/gui/qml/GzCard.qml +++ b/include/gz/gui/qml/GzCard.qml @@ -114,7 +114,7 @@ Pane { /** * Minimum height of the card pane */ - property double cardMinimumHeight: content.minimumHeight; + property int cardMinimumHeight: content.minimumHeight; property double cardMaximumHeight: Infinity diff --git a/src/Application.cc b/src/Application.cc index a7a6cdbc6..f00dfbea1 100644 --- a/src/Application.cc +++ b/src/Application.cc @@ -735,7 +735,6 @@ bool Application::AddPluginsToWindow() Q_ARG(QVariant, QVariant::fromValue(cardItem))); // Add card to main window - // gzdbg << "Adding to:" << splitItem.toString().toStdString() << std::endl; cardItem->setParent(this->dataPtr->engine); plugin->setParent(this->dataPtr->mainWin); diff --git a/src/MainWindow_TEST.cc b/src/MainWindow_TEST.cc index 0d2fc6d81..b80b4ad5a 100644 --- a/src/MainWindow_TEST.cc +++ b/src/MainWindow_TEST.cc @@ -742,8 +742,8 @@ TEST(MainWindowTest, GZ_UTILS_TEST_ENABLED_ONLY_ON_LINUX(ApplyConfig)) WindowConfig c; // c.posX = 1000; // c.posY = 2000; - c.width = 100; - c.height = 200; + c.width = 300; + c.height = 400; c.materialTheme = "Dark"; c.materialPrimary = "#ff0000"; c.materialAccent = "Indigo"; @@ -765,8 +765,8 @@ TEST(MainWindowTest, GZ_UTILS_TEST_ENABLED_ONLY_ON_LINUX(ApplyConfig)) // EXPECT_NE(c.posX, 1000); // EXPECT_NE(c.posY, 2000); - EXPECT_EQ(c.width, 100); - EXPECT_EQ(c.height, 200); + EXPECT_EQ(c.width, 300); + EXPECT_EQ(c.height, 400); EXPECT_EQ(c.materialTheme, "Dark"); EXPECT_EQ(c.materialPrimary, "#ff0000"); // Always save hex diff --git a/src/Plugin.cc b/src/Plugin.cc index 03748e845..e3cbf6778 100644 --- a/src/Plugin.cc +++ b/src/Plugin.cc @@ -52,7 +52,11 @@ const std::unordered_set kAnchorLineSet{ const std::unordered_set kIgnoredProps{ "objectName", "pluginName", - "anchored"}; + "anchored", + "floating", + "cardMinimumWidth", + "cardMinimumHeight", + "cardMaximumHeight"}; } // namespace namespace gz::gui diff --git a/src/Plugin_TEST.cc b/src/Plugin_TEST.cc index 76d9fa78c..000c44355 100644 --- a/src/Plugin_TEST.cc +++ b/src/Plugin_TEST.cc @@ -273,15 +273,11 @@ TEST(PluginTest, GZ_UTILS_TEST_DISABLED_ON_WIN32(ConfigStrInputNoPlugin)) std::unordered_map pluginTypes; pluginProps["showTitleBar"] = "true"; pluginProps["resizable"] = "true"; - pluginProps["cardMinimumWidth"] = "290"; - pluginProps["cardMinimumHeight"] = "110"; pluginProps["z"] = "0"; pluginProps["state"] = "docked"; pluginTypes["showTitleBar"] = "bool"; pluginTypes["resizable"] = "bool"; - pluginTypes["cardMinimumWidth"] = "int"; - pluginTypes["cardMinimumHeight"] = "int"; pluginTypes["z"] = "double"; pluginTypes["state"] = "string";