From 7c90a0900b250abf17a76f7da8c7fceb3298bb05 Mon Sep 17 00:00:00 2001
From: Raphael Grimm <raphael.grimm@student.kit.edu>
Date: Tue, 15 Aug 2017 13:21:10 +0200
Subject: [PATCH] Change WidgetDescription::makeGroupBox to optionally add a
frame
---
.../DefaultWidgetDescriptions/DefaultWidgetDescriptions.cpp | 3 ++-
.../DefaultWidgetDescriptions/DefaultWidgetDescriptions.h | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/source/ArmarXGui/libraries/DefaultWidgetDescriptions/DefaultWidgetDescriptions.cpp b/source/ArmarXGui/libraries/DefaultWidgetDescriptions/DefaultWidgetDescriptions.cpp
index 7975ece6..5bbb883a 100644
--- a/source/ArmarXGui/libraries/DefaultWidgetDescriptions/DefaultWidgetDescriptions.cpp
+++ b/source/ArmarXGui/libraries/DefaultWidgetDescriptions/DefaultWidgetDescriptions.cpp
@@ -99,11 +99,12 @@ namespace armarx
return l;
}
- GroupBoxPtr makeGroupBox(std::string label, WidgetPtr child)
+ GroupBoxPtr makeGroupBox(std::string label, WidgetPtr child, bool framed)
{
GroupBoxPtr w = new GroupBox;
w->child = std::move(child);
w->label = std::move(label);
+ w->framed = framed;
return w;
}
diff --git a/source/ArmarXGui/libraries/DefaultWidgetDescriptions/DefaultWidgetDescriptions.h b/source/ArmarXGui/libraries/DefaultWidgetDescriptions/DefaultWidgetDescriptions.h
index ba396ad1..4c38cde5 100644
--- a/source/ArmarXGui/libraries/DefaultWidgetDescriptions/DefaultWidgetDescriptions.h
+++ b/source/ArmarXGui/libraries/DefaultWidgetDescriptions/DefaultWidgetDescriptions.h
@@ -40,7 +40,7 @@ namespace armarx
FormLayoutPtr makeFormLayout(std::vector<std::pair<std::string, WidgetPtr>> elements);
FormLayoutPtr makeFormLayout(std::vector<WidgetPtr> elements);
- GroupBoxPtr makeGroupBox(std::string label, WidgetPtr child);
+ GroupBoxPtr makeGroupBox(std::string label, WidgetPtr child, bool framed = false);
WidgetPtr makeFrame(WidgetPtr child);
--
GitLab