disallowed pagination of 1
fixed pagination setting bugs in valve style --HG-- extra : convert_revision : svn%3A39bc706e-5318-0410-9160-8a85361fbb7c/trunk%40826
This commit is contained in:
parent
daceab19cd
commit
1049600e99
@ -548,7 +548,7 @@ unsigned int CBaseMenu::GetItemCount()
|
|||||||
|
|
||||||
bool CBaseMenu::SetPagination(unsigned int itemsPerPage)
|
bool CBaseMenu::SetPagination(unsigned int itemsPerPage)
|
||||||
{
|
{
|
||||||
if (itemsPerPage > 7)
|
if (itemsPerPage > 7 || itemsPerPage == 1)
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
@ -322,6 +322,7 @@ void CRadioDisplay::DeleteThis()
|
|||||||
bool CRadioDisplay::SetSelectableKeys(unsigned int keymap)
|
bool CRadioDisplay::SetSelectableKeys(unsigned int keymap)
|
||||||
{
|
{
|
||||||
keys = (signed)keymap;
|
keys = (signed)keymap;
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
CRadioMenu::CRadioMenu(IMenuHandler *pHandler, IdentityToken_t *pOwner) :
|
CRadioMenu::CRadioMenu(IMenuHandler *pHandler, IdentityToken_t *pOwner) :
|
||||||
|
@ -325,14 +325,12 @@ void CValveMenu::Cancel_Finally()
|
|||||||
|
|
||||||
bool CValveMenu::SetPagination(unsigned int itemsPerPage)
|
bool CValveMenu::SetPagination(unsigned int itemsPerPage)
|
||||||
{
|
{
|
||||||
if (itemsPerPage < 1 || itemsPerPage > 5)
|
if (itemsPerPage > 5)
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
CBaseMenu::SetPagination(itemsPerPage);
|
return CBaseMenu::SetPagination(itemsPerPage);
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
bool CValveMenu::SetExtOption(MenuOption option, const void *valuePtr)
|
bool CValveMenu::SetExtOption(MenuOption option, const void *valuePtr)
|
||||||
|
Loading…
Reference in New Issue
Block a user