From 4e5ac673e2d7203c42ab296e2efe09ab9d1f872f Mon Sep 17 00:00:00 2001
From: Raphael Grimm <raphael.grimm@student.kit.edu>
Date: Tue, 15 Aug 2017 13:20:40 +0200
Subject: [PATCH] Add a make function to add a frame to a
WidgetDescription::Widget
---
.../DefaultWidgetDescriptions/DefaultWidgetDescriptions.cpp | 6 ++++++
.../DefaultWidgetDescriptions/DefaultWidgetDescriptions.h | 2 ++
2 files changed, 8 insertions(+)
diff --git a/source/ArmarXGui/libraries/DefaultWidgetDescriptions/DefaultWidgetDescriptions.cpp b/source/ArmarXGui/libraries/DefaultWidgetDescriptions/DefaultWidgetDescriptions.cpp
index 92863f93..7975ece6 100644
--- a/source/ArmarXGui/libraries/DefaultWidgetDescriptions/DefaultWidgetDescriptions.cpp
+++ b/source/ArmarXGui/libraries/DefaultWidgetDescriptions/DefaultWidgetDescriptions.cpp
@@ -107,6 +107,12 @@ namespace armarx
return w;
}
+ WidgetPtr makeFrame(WidgetPtr child)
+ {
+ child->framed = true;
+ return std::move(child);
+ }
+
HSpacerPtr makeHSpacer()
{
return new HSpacer;
diff --git a/source/ArmarXGui/libraries/DefaultWidgetDescriptions/DefaultWidgetDescriptions.h b/source/ArmarXGui/libraries/DefaultWidgetDescriptions/DefaultWidgetDescriptions.h
index 73e26fe2..ba396ad1 100644
--- a/source/ArmarXGui/libraries/DefaultWidgetDescriptions/DefaultWidgetDescriptions.h
+++ b/source/ArmarXGui/libraries/DefaultWidgetDescriptions/DefaultWidgetDescriptions.h
@@ -42,6 +42,8 @@ namespace armarx
GroupBoxPtr makeGroupBox(std::string label, WidgetPtr child);
+ WidgetPtr makeFrame(WidgetPtr child);
+
HSpacerPtr makeHSpacer();
VSpacerPtr makeVSpacer();
LabelPtr makeLabel(std::string text);
--
GitLab