caiyu/nim_duilib
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复TabBox在XML中设置selectedid无效的bug

Browse Source
This commit is contained in:
evilbeast 2019-06-28 00:51:38 +08:00
parent fed15690c0
commit f8cd48cbfe
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tool_kits/duilib/Box/TabBox.cpp
View File

@ -16,8 +16,10 @@ bool TabBox::Add(Control* pControl)
if(m_iCurSel == -1 && pControl->IsVisible()) { if(m_iCurSel == -1 && pControl->IsVisible()) {
m_iCurSel = GetItemIndex(pControl); m_iCurSel = GetItemIndex(pControl);
} }
else {
if (m_iCurSel != GetItemIndex(pControl) || !pControl->IsVisible())
{
if (!IsFadeSwitch()) { if (!IsFadeSwitch()) {
pControl->SetVisible(false); pControl->SetVisible(false);
} }
@ -27,7 +29,6 @@ bool TabBox::Add(Control* pControl)
} }
pControl->SetAlpha(0); pControl->SetAlpha(0);
} }
return ret; return ret;
} }
@ -221,7 +222,7 @@ bool TabBox::SelectItem(const std::wstring& pControlName)
void TabBox::SetAttribute(const std::wstring& strName, const std::wstring& strValue) void TabBox::SetAttribute(const std::wstring& strName, const std::wstring& strValue)
{ {
if( strName == _T("selectedid") ) SelectItem(_ttoi(strValue.c_str())); if (strName == _T("selectedid")) m_iCurSel = _ttoi(strValue.c_str());
else if( strName == _T("fadeswitch") ) SetFadeSwitch(strValue == _T("true")); else if( strName == _T("fadeswitch") ) SetFadeSwitch(strValue == _T("true"));
else Box::SetAttribute(strName, strValue); else Box::SetAttribute(strName, strValue);
} }