From eb191f9ff3d9b1b83549dfd0fde583ceaae1493e Mon Sep 17 00:00:00 2001
From: Peter Albrecht <albrecpe@gmail.com>
Date: Fri, 12 Jan 2024 17:11:07 +0100
Subject: [PATCH] Fixed static resizing of columns
---
.../skills_gui/skill_details/SkillDetailsGroupBox.cpp | 7 +++++++
.../skills_gui/skill_details/SkillDetailsGroupBox.h | 1 +
.../skills_gui/skill_details/SkillDetailsTreeWidget.cpp | 9 +--------
.../skills_gui/skill_details/SkillDetailsTreeWidget.h | 5 +----
4 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/source/RobotAPI/libraries/skills_gui/skill_details/SkillDetailsGroupBox.cpp b/source/RobotAPI/libraries/skills_gui/skill_details/SkillDetailsGroupBox.cpp
index 6fa1f1107..a5d5b9e80 100644
--- a/source/RobotAPI/libraries/skills_gui/skill_details/SkillDetailsGroupBox.cpp
+++ b/source/RobotAPI/libraries/skills_gui/skill_details/SkillDetailsGroupBox.cpp
@@ -89,6 +89,13 @@ namespace armarx::skills::gui
}
}
+ void
+ SkillDetailGroupBox::resizeEvent(QResizeEvent* event)
+ {
+ QGroupBox::resizeEvent(event);
+ skillDetailsTreeWidget->resizeContents();
+ }
+
void
SkillDetailGroupBox::setupUi()
{
diff --git a/source/RobotAPI/libraries/skills_gui/skill_details/SkillDetailsGroupBox.h b/source/RobotAPI/libraries/skills_gui/skill_details/SkillDetailsGroupBox.h
index ba062418c..918fa2ec3 100644
--- a/source/RobotAPI/libraries/skills_gui/skill_details/SkillDetailsGroupBox.h
+++ b/source/RobotAPI/libraries/skills_gui/skill_details/SkillDetailsGroupBox.h
@@ -48,6 +48,7 @@ namespace armarx::skills::gui
private slots:
void handleExecutionRequest();
+ void resizeEvent(QResizeEvent* event) override;
private:
void setupUi();
diff --git a/source/RobotAPI/libraries/skills_gui/skill_details/SkillDetailsTreeWidget.cpp b/source/RobotAPI/libraries/skills_gui/skill_details/SkillDetailsTreeWidget.cpp
index 7914241f1..fa9721414 100644
--- a/source/RobotAPI/libraries/skills_gui/skill_details/SkillDetailsTreeWidget.cpp
+++ b/source/RobotAPI/libraries/skills_gui/skill_details/SkillDetailsTreeWidget.cpp
@@ -3,6 +3,7 @@
#include <QApplication>
#include <QClipboard>
#include <QHeaderView>
+#include <QResizeEvent>
#include <QVBoxLayout>
#include <RobotAPI/libraries/aron/converter/json/NLohmannJSONConverter.h>
@@ -100,14 +101,6 @@ 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()
{
diff --git a/source/RobotAPI/libraries/skills_gui/skill_details/SkillDetailsTreeWidget.h b/source/RobotAPI/libraries/skills_gui/skill_details/SkillDetailsTreeWidget.h
index 3cf181090..106f9200d 100644
--- a/source/RobotAPI/libraries/skills_gui/skill_details/SkillDetailsTreeWidget.h
+++ b/source/RobotAPI/libraries/skills_gui/skill_details/SkillDetailsTreeWidget.h
@@ -29,9 +29,7 @@ namespace armarx::skills::gui
public slots:
void disconnectGui();
void updateGui();
-
- private slots:
- void resizeEvent(QResizeEvent* event) override;
+ void resizeContents();
private:
struct ShownSkill
@@ -48,7 +46,6 @@ namespace armarx::skills::gui
AronTreeWidgetControllerPtr aronTreeWidgetController = nullptr;
void setupUi();
- void resizeContents();
};
} // namespace armarx::skills::gui
--
GitLab