修正二次菜单控件内存泄漏的问题；

修正List可编辑模式Edit显示错位的问题；
r00tcxx · Jun 16, 2017 · 822f994 · 822f994
1 parent 6c5e218
commit 822f994
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 4 deletions.
diff --git a/Demos/duidemo/MainWnd.cpp b/Demos/duidemo/MainWnd.cpp
@@ -126,6 +126,7 @@ void CMainWnd::InitWindow()
 	pListItem->SetChildVAlign(DT_VCENTER);
 	pListItem->SetFixedHeight(30);
 	pListItem->SetManager(&m_pm, NULL, false);
+	pListItem->SetFixedWidth(100);
 	pList->Add(pListItem);
 	CButtonUI* pBtn1 = new CButtonUI();
 	pBtn1->SetManager(&m_pm, NULL, false);
@@ -142,6 +143,7 @@ void CMainWnd::InitWindow()
 
 	CDialogBuilder builder1;
 	CListContainerElementUI* pListItem1  = (CListContainerElementUI*)builder1.Create(_T("listitem.xml"), NULL, this, &m_pm, NULL);
+
 	pList->Add(pListItem1);
 	for(int i = 0; i < 20; i++)
 	{

diff --git a/DuiLib/Control/UIList.cpp b/DuiLib/Control/UIList.cpp
@@ -126,8 +126,9 @@ namespace DuiLib {
 		if( pListItem != NULL ) {
 			pListItem->SetOwner(this);
 			pListItem->SetIndex(GetCount());
+			return m_pList->Add(pControl);
 		}
-		return m_pList->Add(pControl);
+		return CVerticalLayoutUI::Add(pControl);
 	}
 
 	bool CListUI::AddAt(CControlUI* pControl, int iIndex)

diff --git a/DuiLib/Control/UIList.h b/DuiLib/Control/UIList.h
@@ -228,7 +228,6 @@ namespace DuiLib {
 
 		virtual BOOL CheckColumEditable(int nColum) { return FALSE; };
 		virtual CEditUI* GetEditUI() { return NULL; };
-
 		virtual BOOL CheckColumComboBoxable(int nColum) { return FALSE; };
 		virtual CComboBoxUI* GetComboBoxUI() { return NULL; };
 

diff --git a/DuiLib/Control/UIMenu.cpp b/DuiLib/Control/UIMenu.cpp
@@ -336,7 +336,7 @@ namespace DuiLib {
 			if( pDefaultAttributes ) {
 				m_pLayout->ApplyAttributeList(pDefaultAttributes);
 			}
-			m_pLayout->SetAutoDestroy(false);
+			m_pLayout->GetList()->SetAutoDestroy(false);
 
 			for( int i = 0; i < m_pOwner->GetCount(); i++ ) {
 				if(m_pOwner->GetItemAt(i)->GetInterface(_T("MenuElement")) != NULL ){

diff --git a/bin/skin/duidemo/main.xml b/bin/skin/duidemo/main.xml
@@ -198,7 +198,7 @@
                   <ListHeaderItem text="成绩" width="160" hotimage="res='common/list_header_hot.png'" pushedimage="res='common/list_header_pushed.png'" sepimage="res='common/list_header_sep.png'" sepwidth="1"/>
                   <ListHeaderItem text="审核" width="160" hotimage="res='common/list_header_hot.png'" pushedimage="res='common/list_header_pushed.png'" sepimage="res='common/list_header_sep.png'" sepwidth="1"/>
                 </ListHeader>
-                <!--<Include source="listitem.xml"/>-->
+                <Include source="listitem.xml"/>
               </List>
             </VerticalLayout>
           </HorizontalLayout>