Add gui combobox missing functions #280
Conversation
| RUN_CHILDREN(GUIComboBoxGetItemCount(**iter)) | ||
|
|
||
| // Are we a CGUI Element? | ||
| if (IS_GUI(&Entity)) |
There was a problem hiding this comment.
Please fix the indentation here and below.
| int state; | ||
| CScriptArgReader argStream(luaVM); | ||
| argStream.ReadUserData<CGUIComboBox>(comboBox); | ||
| argStream.ReadNumber(state); |
There was a problem hiding this comment.
I'd personally prefer an enum string here (and ofc return a string in guiComboxGetState). I'd like to hear other opinions though.
Or, an even better solution - as you only distinguish two states - is to rename the function to guiComboxIsOpen and make it return a boolean.
| if (IS_GUI(&Entity)) | ||
| { | ||
| CClientGUIElement& GUIElement = static_cast<CClientGUIElement&>(Entity); | ||
| int comboState; |
There was a problem hiding this comment.
Tip: Try reducing the scope of variables as much as possible, i.e. move comboState into the if block or avoid creating it entirely by directly returning from the vs / !vs - if blocks.
|
Everything fixed |
| @@ -5189,6 +5189,72 @@ bool CStaticFunctionDefinitions::GUIComboBoxSetItemText(CClientEntity& Entity, i | |||
| return false; | |||
| } | |||
|
|
|||
| int CStaticFunctionDefinitions::GUIComboBoxGetItemCount(CClientEntity& Entity) | |||
| { | |||
| RUN_CHILDREN(GUIComboBoxGetItemCount(**iter)) | |||
There was a problem hiding this comment.
RUN_CHILDREN is unnecessary in Get methods
|
|
||
| bool CStaticFunctionDefinitions::GUIComboBoxIsOpen(CClientEntity& Entity) | ||
| { | ||
| RUN_CHILDREN(GUIComboBoxIsOpen(**iter)) |
There was a problem hiding this comment.
As above, RUN_CHILDREN is unnecessary in Get methods
Client/gui/CGUIComboBox_Impl.cpp
Outdated
| @@ -241,6 +241,11 @@ void CGUIComboBox_Impl::Clear(void) | |||
| m_pWindow->setText(storedCaption); | |||
| } | |||
|
|
|||
| bool CGUIComboBox_Impl::GetState(void) | |||
There was a problem hiding this comment.
Should be renamed to IsOpen
|
@qaisjp @Jusonex What's the status on these reviews? |
Syntax
guiComboBoxIsOpen return boolean, nil if bad argument
guiComboBoxSetOpen return boolean