diff --git a/source/RobotAPI/gui-plugins/SkillManagerPlugin/SkillManagerMonitorWidget.ui b/source/RobotAPI/gui-plugins/SkillManagerPlugin/SkillManagerMonitorWidget.ui index 65c28683d214623c6c558c691adfae0a771411fe..88daea56ca801bdcd88785d54cb748c97b5e8ebc 100644 --- a/source/RobotAPI/gui-plugins/SkillManagerPlugin/SkillManagerMonitorWidget.ui +++ b/source/RobotAPI/gui-plugins/SkillManagerPlugin/SkillManagerMonitorWidget.ui @@ -19,7 +19,7 @@ <property name="windowTitle"> <string>SkillManagerMonitorWidget</string> </property> - <layout class="QGridLayout" name="gridLayout_3" rowstretch="0,0,0,0,0"> + <layout class="QGridLayout" name="gridLayout_3" rowstretch="0,0,0,0,0,0"> <item row="3" column="0" colspan="2"> <widget class="QSplitter" name="splitter_2"> <property name="enabled"> @@ -161,7 +161,7 @@ </item> </layout> </item> - <item row="4" column="0" colspan="2"> + <item row="5" column="0" colspan="2"> <widget class="QLabel" name="connectionStatusLabel"> <property name="text"> <string>(hidden in GUI)</string> diff --git a/source/RobotAPI/libraries/skills_gui/skill_details/SkillDetailsTreeWidget.cpp b/source/RobotAPI/libraries/skills_gui/skill_details/SkillDetailsTreeWidget.cpp index 184aec420557693d47088581e85950eea82ed20a..7914241f11cb1e592dc282282063fe01c0ce271c 100644 --- a/source/RobotAPI/libraries/skills_gui/skill_details/SkillDetailsTreeWidget.cpp +++ b/source/RobotAPI/libraries/skills_gui/skill_details/SkillDetailsTreeWidget.cpp @@ -2,6 +2,7 @@ #include <QApplication> #include <QClipboard> +#include <QHeaderView> #include <QVBoxLayout> #include <RobotAPI/libraries/aron/converter/json/NLohmannJSONConverter.h> @@ -99,6 +100,14 @@ namespace armarx::skills::gui this->updateContents(sid, descr); } + // dummy reimplementation, adds column resize + void + SkillDetailsTreeWidget::resizeEvent(QResizeEvent* event) + { + QTreeWidget::resizeEvent(event); + this->resizeContents(); + } + void SkillDetailsTreeWidget::setupUi() { @@ -131,7 +140,9 @@ namespace armarx::skills::gui const int dynamicColumnSize = widthRemainder / 2; // set width... + this->setColumnWidth(0, dynamicColumnSize); + this->setColumnWidth(1, dynamicColumnSize); } @@ -163,7 +174,6 @@ namespace armarx::skills::gui void SkillDetailsTreeWidget::pasteCurrentConfig() { - QClipboard* clipboard = QApplication::clipboard(); std::string s = clipboard->text().toStdString(); nlohmann::json json = nlohmann::json::parse(s); diff --git a/source/RobotAPI/libraries/skills_gui/skill_details/SkillDetailsTreeWidget.h b/source/RobotAPI/libraries/skills_gui/skill_details/SkillDetailsTreeWidget.h index bd3dd78f6ae1683844ce58c5ef6e97e4e6106513..3cf18109063f457cd76363a8c7a56fb679df53d9 100644 --- a/source/RobotAPI/libraries/skills_gui/skill_details/SkillDetailsTreeWidget.h +++ b/source/RobotAPI/libraries/skills_gui/skill_details/SkillDetailsTreeWidget.h @@ -30,6 +30,9 @@ namespace armarx::skills::gui void disconnectGui(); void updateGui(); + private slots: + void resizeEvent(QResizeEvent* event) override; + private: struct ShownSkill {