From 8b74e47c86724c8ae0edf2c222a422a7028a13d9 Mon Sep 17 00:00:00 2001
From: jiajia_deng <2894220@gmail.com>
Date: Tue, 18 Jun 2019 10:28:29 +0800
Subject: [PATCH] Fixed #46 removed default value from Combo constructor
- Added combo and single line text control sample to `controls` project.
- Modified RichEdit.md to remove duplicate attributes.
Signed-off-by: jiajia_deng <2894220@gmail.com>
---
.../themes/default/controls/controls.xml | 24 ++++++++++++-------
docs/Controls/RichEdit.md | 1 -
samples/controls/controls_form.cpp | 13 ++++++++++
tool_kits/duilib/Control/Combo.cpp | 2 --
4 files changed, 29 insertions(+), 11 deletions(-)
diff --git a/bin/resources/themes/default/controls/controls.xml b/bin/resources/themes/default/controls/controls.xml
index 6c932296..b58620cd 100644
--- a/bin/resources/themes/default/controls/controls.xml
+++ b/bin/resources/themes/default/controls/controls.xml
@@ -43,14 +43,22 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/docs/Controls/RichEdit.md b/docs/Controls/RichEdit.md
index ba7bc72d..ded183fb 100644
--- a/docs/Controls/RichEdit.md
+++ b/docs/Controls/RichEdit.md
@@ -20,7 +20,6 @@
| number | false | BOOL | 是否只允许输入数字,如(false) |
| align | left | STRING | 文字对齐方式,取值left、right、hcenter、top、vcenter、bottom,如(right) |
| font | -1 | INT | 字体id,如(0) |
-| promptmode | false | BOOL | 是否显示提示文字,如(true) |
| vscrollbar | false | BOOL | 是否使用竖向滚动条,如(true) |
| autovscroll | false | BOOL | 是否随输入竖向滚动,如(true) |
| hscrollbar | false | BOOL | 是否使用横向滚动条,如(true) |
diff --git a/samples/controls/controls_form.cpp b/samples/controls/controls_form.cpp
index aa3539a9..88dd30bb 100644
--- a/samples/controls/controls_form.cpp
+++ b/samples/controls/controls_form.cpp
@@ -70,6 +70,19 @@ void ControlForm::InitWindow()
}
}
+ /* Initialize ComboBox data */
+ ui::Combo* combo = dynamic_cast(FindControl(L"combo"));
+ for (auto i = 0; i < 10; i++)
+ {
+ ui::ListContainerElement* element = new ui::ListContainerElement;
+ element->SetClass(L"listitem");
+ element->SetFixedHeight(30);
+ element->SetBkColor(L"white");
+ element->SetTextPadding({ 6,0,6,0 });
+ element->SetText(nbase::StringPrintf(L"Combo element %d", i));
+ combo->Add(element);
+ }
+
/* Load xml file content in global misc thread, and post update RichEdit task to UI thread */
StdClosure closure = [this]() {
std::streamoff length = 0;
diff --git a/tool_kits/duilib/Control/Combo.cpp b/tool_kits/duilib/Control/Combo.cpp
index f9960deb..19e015ff 100644
--- a/tool_kits/duilib/Control/Combo.cpp
+++ b/tool_kits/duilib/Control/Combo.cpp
@@ -144,8 +144,6 @@ Combo::Combo() :
// the items back to the righfull owner/manager when the window closes.
m_pLayout.reset(new ListBox(new VLayout));
m_pLayout->GetLayout()->SetPadding(UiRect(1, 1, 1, 1));
- m_pLayout->SetBkColor(L"bk_wnd_lightcolor");
- m_pLayout->SetBorderColor(L"combobox_border");
m_pLayout->SetBorderSize(UiRect(1, 1, 1, 1));
m_pLayout->SetAutoDestroy(false);
m_pLayout->EnableScrollBar();