Skip to content

[NO SQUASH] IrrlichtMt: CGUIComboBox improvements #17181

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SmallJoker wants to merge 2 commits into
base: master
Choose a base branch
from
+20 −19
Open

[NO SQUASH] IrrlichtMt: CGUIComboBox improvements #17181

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a077a0
CGUIComboBox: Always return a valid pointer in getText()
SmallJoker May 14, 2026
83fa440
CGUIComboBox: Clean up event handling
SmallJoker May 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 20 additions & 19 deletions irr/src/CGUIComboBox.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,8 @@ void CGUIComboBox::removeItem(u32 idx)
//! Returns caption of this element.
const wchar_t *CGUIComboBox::getText() const
{
return getItem(Selected);
const wchar_t *item = getItem(Selected);
return item ? item : L"";
}

//! adds an item and returns the index of it
Expand Down Expand Up @@ -235,11 +236,10 @@ bool CGUIComboBox::OnEvent(const SEvent &event)
switch (event.GUIEvent.EventType) {
case EGET_ELEMENT_FOCUS_LOST:
if (ListBox &&
(Environment->hasFocus(ListBox) || ListBox->isMyDescendant(event.GUIEvent.Caller)) &&
// Newly focused element
event.GUIEvent.Element != this &&
!isMyDescendant(event.GUIEvent.Element) &&
!ListBox->isMyDescendant(event.GUIEvent.Element)) {
openCloseMenu();
!isMyDescendant(event.GUIEvent.Element)) {
openCloseMenu(); // close
}
break;
case EGET_BUTTON_CLICKED:
Expand All @@ -263,28 +263,23 @@ bool CGUIComboBox::OnEvent(const SEvent &event)
break;
}
break;
case EET_MOUSE_INPUT_EVENT:
case EET_MOUSE_INPUT_EVENT: {
core::position2d<s32> p(event.MouseInput.X, event.MouseInput.Y);

switch (event.MouseInput.Event) {
case EMIE_LMOUSE_PRESSED_DOWN: {
core::position2d<s32> p(event.MouseInput.X, event.MouseInput.Y);

// send to list box
if (ListBox && ListBox->isPointInside(p) && ListBox->OnEvent(event))
if (!ListBox && isPointInside(p)) {
// Quick select: mouse down -> drag to position -> mouse up -> (selected)
openCloseMenu(); // open
return true;
}

return true;
break;
}
case EMIE_LMOUSE_LEFT_UP: {
core::position2d<s32> p(event.MouseInput.X, event.MouseInput.Y);

// send to list box
if (!(ListBox &&
ListBox->getAbsolutePosition().isPointInside(p) &&
ListBox->OnEvent(event))) {
openCloseMenu();
}
return true;
// Eaten by CGUIListBox
break;
}
case EMIE_MOUSE_WHEEL: {
// Try scrolling parent first
Expand All @@ -310,7 +305,13 @@ bool CGUIComboBox::OnEvent(const SEvent &event)
default:
break;
}

// Prevent interaction with underlying elements.
if (isPointInside(p) || (ListBox && ListBox->isPointInside(p)))
return true;

break;
}
default:
break;
}
Expand Down
Loading