aboutsummaryrefslogtreecommitdiff
path: root/CruUI/ui/controls/button.h
diff options
context:
space:
mode:
authorcrupest <crupest@outlook.com>2018-09-22 22:57:44 +0800
committercrupest <crupest@outlook.com>2018-09-22 22:57:44 +0800
commit5d91d1e5594e37ca5c282e602407eaeb34c6d986 (patch)
tree0086bb88c152b8ea9eb31e86906afcd238309cda /CruUI/ui/controls/button.h
parentdc293cef8f25ba70c5d99d73aa472277484ca879 (diff)
downloadcru-5d91d1e5594e37ca5c282e602407eaeb34c6d986.tar.gz
cru-5d91d1e5594e37ca5c282e602407eaeb34c6d986.tar.bz2
cru-5d91d1e5594e37ca5c282e602407eaeb34c6d986.zip
Done 3 things:
1. Add some helper functions for create controls with layout params. 2. Fix a bug in measure of linear layout. 3. Fix a bug in exception.
Diffstat (limited to 'CruUI/ui/controls/button.h')
-rw-r--r--CruUI/ui/controls/button.h9
1 files changed, 7 insertions, 2 deletions
diff --git a/CruUI/ui/controls/button.h b/CruUI/ui/controls/button.h
index f9ad7726..bd3f6eb3 100644
--- a/CruUI/ui/controls/button.h
+++ b/CruUI/ui/controls/button.h
@@ -1,5 +1,7 @@
#pragma once
+#include <initializer_list>
+
#include "ui/control.h"
namespace cru::ui::controls
@@ -7,9 +9,12 @@ namespace cru::ui::controls
class Button : public Control
{
public:
- static Button* Create()
+ static Button* Create(const std::initializer_list<Control*>& children = std::initializer_list<Control*>())
{
- return new Button();
+ const auto button = new Button();
+ for (const auto control : children)
+ button->AddChild(control);
+ return button;
}
protected: