Fixed three critical bugs preventing UITextInput from working: 1. **hitTest() missing textinput handler**: The hit test function only checked for button, slider, and checkbox types. Clicks on text input fields were never detected. FIX: Added textinput case to hitTest() in UIContext.cpp 2. **dispatchMouseButton() missing textinput handler**: Even if hit test worked, mouse button events were not dispatched to text input widgets. FIX: Added textinput case to dispatchMouseButton() in UIContext.cpp 3. **Keyboard event collision**: SDL_KEYDOWN was publishing events for printable characters with char=0, which were rejected by UITextInput. Printable chars should only come from SDL_TEXTINPUT. FIX: Only publish SDL_KEYDOWN for special keys (Backspace, Delete, arrows, etc.) Printable characters come exclusively from SDL_TEXTINPUT events. Changes: - UIContext.cpp: Added textinput handlers to hitTest() and dispatchMouseButton() - UITextInput.cpp: Added debug logging for gainFocus() and render() - UIModule.cpp: Added debug logging for widget clicks - test_ui_showcase.cpp: Fixed keyboard event handling (KEYDOWN vs TEXTINPUT) Tested: Text input now gains focus (border turns blue), accepts keyboard input, and displays typed text correctly. Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
331 lines
10 KiB
C++
331 lines
10 KiB
C++
#include "UITextInput.h"
|
|
#include "../Core/UIContext.h"
|
|
#include "../Rendering/UIRenderer.h"
|
|
#include <algorithm>
|
|
#include <cctype>
|
|
#include <spdlog/spdlog.h>
|
|
|
|
namespace grove {
|
|
|
|
void UITextInput::update(UIContext& ctx, float deltaTime) {
|
|
// Update state based on enabled/focused flags
|
|
if (!enabled) {
|
|
state = TextInputState::Disabled;
|
|
isFocused = false;
|
|
} else if (isFocused) {
|
|
state = TextInputState::Focused;
|
|
|
|
// Update cursor blink animation
|
|
cursorBlinkTimer += deltaTime;
|
|
if (cursorBlinkTimer >= CURSOR_BLINK_INTERVAL) {
|
|
cursorBlinkTimer = 0.0f;
|
|
cursorVisible = !cursorVisible;
|
|
}
|
|
} else {
|
|
state = TextInputState::Normal;
|
|
cursorVisible = false;
|
|
}
|
|
|
|
// Update children (text inputs typically don't have children, but support it)
|
|
updateChildren(ctx, deltaTime);
|
|
}
|
|
|
|
void UITextInput::render(UIRenderer& renderer) {
|
|
// Register with renderer on first render (need 5 entries: bg, border, text, placeholder, cursor)
|
|
if (!m_registered) {
|
|
m_renderId = renderer.registerEntry(); // Background
|
|
m_borderRenderId = renderer.registerEntry(); // Border
|
|
m_textRenderId = renderer.registerEntry(); // Text content
|
|
m_placeholderRenderId = renderer.registerEntry(); // Placeholder text
|
|
m_cursorRenderId = renderer.registerEntry(); // Cursor
|
|
m_registered = true;
|
|
// Set destroy callback to unregister all entries
|
|
setDestroyCallback([&renderer,
|
|
borderId = m_borderRenderId,
|
|
textId = m_textRenderId,
|
|
placeholderId = m_placeholderRenderId,
|
|
cursorId = m_cursorRenderId](uint32_t id) {
|
|
renderer.unregisterEntry(id);
|
|
renderer.unregisterEntry(borderId);
|
|
renderer.unregisterEntry(textId);
|
|
renderer.unregisterEntry(placeholderId);
|
|
renderer.unregisterEntry(cursorId);
|
|
});
|
|
}
|
|
|
|
const TextInputStyle& style = getCurrentStyle();
|
|
|
|
// Retained mode: update entries with current state
|
|
int bgLayer = renderer.nextLayer();
|
|
|
|
// Render background
|
|
renderer.updateRect(m_renderId, absX, absY, width, height, style.bgColor, bgLayer);
|
|
|
|
// Render border
|
|
int borderLayer = renderer.nextLayer();
|
|
uint32_t borderColor = isFocused ? style.focusBorderColor : style.borderColor;
|
|
|
|
static int renderCount = 0;
|
|
if (renderCount < 5) {
|
|
spdlog::info("🎨 UITextInput '{}' render: isFocused={}, borderColor=0x{:08X} (focus=0x{:08X}, normal=0x{:08X})",
|
|
id, isFocused, borderColor, style.focusBorderColor, style.borderColor);
|
|
renderCount++;
|
|
}
|
|
|
|
renderer.updateRect(m_borderRenderId, absX, absY + height - style.borderWidth,
|
|
width, style.borderWidth, borderColor, borderLayer);
|
|
|
|
// Calculate text area
|
|
float textX = absX + PADDING;
|
|
float textY = absY + height * 0.5f;
|
|
|
|
// Render text or placeholder
|
|
bool showPlaceholder = text.empty() && !placeholder.empty() && !isFocused;
|
|
|
|
if (showPlaceholder) {
|
|
// Show placeholder, hide text and cursor
|
|
int placeholderLayer = renderer.nextLayer();
|
|
renderer.updateText(m_placeholderRenderId, textX, textY, placeholder,
|
|
fontSize, style.placeholderColor, placeholderLayer);
|
|
// Hide text and cursor by setting empty/zero-size
|
|
renderer.updateText(m_textRenderId, 0, 0, "", fontSize, 0, 0);
|
|
renderer.updateRect(m_cursorRenderId, 0, 0, 0, 0, 0, 0);
|
|
} else {
|
|
// Show actual text, hide placeholder
|
|
renderer.updateText(m_placeholderRenderId, 0, 0, "", fontSize, 0, 0);
|
|
|
|
std::string visibleText = getVisibleText();
|
|
int textLayer = renderer.nextLayer();
|
|
|
|
if (!visibleText.empty()) {
|
|
renderer.updateText(m_textRenderId, textX - scrollOffset, textY, visibleText,
|
|
fontSize, style.textColor, textLayer);
|
|
} else {
|
|
renderer.updateText(m_textRenderId, 0, 0, "", fontSize, 0, 0);
|
|
}
|
|
|
|
// Render cursor if focused and visible
|
|
int cursorLayer = renderer.nextLayer();
|
|
if (isFocused && cursorVisible) {
|
|
float cursorX = textX + getCursorPixelOffset() - scrollOffset;
|
|
renderer.updateRect(m_cursorRenderId, cursorX, absY + PADDING,
|
|
CURSOR_WIDTH, height - 2 * PADDING,
|
|
style.cursorColor, cursorLayer);
|
|
} else {
|
|
// Hide cursor
|
|
renderer.updateRect(m_cursorRenderId, 0, 0, 0, 0, 0, 0);
|
|
}
|
|
}
|
|
|
|
// Render children on top
|
|
renderChildren(renderer);
|
|
}
|
|
|
|
bool UITextInput::containsPoint(float px, float py) const {
|
|
return px >= absX && px < absX + width &&
|
|
py >= absY && py < absY + height;
|
|
}
|
|
|
|
bool UITextInput::onMouseButton(int button, bool pressed, float x, float y) {
|
|
if (!enabled) return false;
|
|
|
|
if (button == 0 && pressed) { // Left mouse button down
|
|
if (containsPoint(x, y)) {
|
|
// TODO: Calculate click position and set cursor there
|
|
// For now, just focus
|
|
return true; // Will trigger focus in UIModule
|
|
}
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
bool UITextInput::onKeyInput(int keyCode, uint32_t character, bool ctrl) {
|
|
if (!isFocused || !enabled) return false;
|
|
|
|
// Reset cursor blink on input
|
|
cursorBlinkTimer = 0.0f;
|
|
cursorVisible = true;
|
|
|
|
// Handle special keys
|
|
// Key codes (SDL-like): Backspace=8, Delete=127, Enter=13, Left=37, Right=39, Home=36, End=35
|
|
|
|
if (keyCode == 8) { // Backspace
|
|
deleteCharBefore();
|
|
return true;
|
|
}
|
|
else if (keyCode == 127) { // Delete
|
|
deleteCharAfter();
|
|
return true;
|
|
}
|
|
else if (keyCode == 13 || keyCode == 10) { // Enter/Return
|
|
// Submit action - will be published by UIModule
|
|
return true;
|
|
}
|
|
else if (keyCode == 37) { // Left arrow
|
|
moveCursor(-1);
|
|
return true;
|
|
}
|
|
else if (keyCode == 39) { // Right arrow
|
|
moveCursor(1);
|
|
return true;
|
|
}
|
|
else if (keyCode == 36) { // Home
|
|
setCursorPosition(0);
|
|
return true;
|
|
}
|
|
else if (keyCode == 35) { // End
|
|
setCursorPosition(static_cast<int>(text.length()));
|
|
return true;
|
|
}
|
|
else if (ctrl && keyCode == 'a') {
|
|
// Select all (future feature)
|
|
return true;
|
|
}
|
|
else if (ctrl && keyCode == 'c') {
|
|
// Copy (future feature)
|
|
return true;
|
|
}
|
|
else if (ctrl && keyCode == 'v') {
|
|
// Paste (future feature)
|
|
return true;
|
|
}
|
|
|
|
// Handle printable characters
|
|
if (character >= 32 && character < 127) {
|
|
if (passesFilter(character)) {
|
|
std::string charStr(1, static_cast<char>(character));
|
|
insertText(charStr);
|
|
return true;
|
|
}
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
void UITextInput::gainFocus() {
|
|
if (!isFocused) {
|
|
isFocused = true;
|
|
cursorBlinkTimer = 0.0f;
|
|
cursorVisible = true;
|
|
spdlog::info("🎯 UITextInput '{}' gainFocus() called - isFocused={}", id, isFocused);
|
|
}
|
|
}
|
|
|
|
void UITextInput::loseFocus() {
|
|
if (isFocused) {
|
|
isFocused = false;
|
|
cursorVisible = false;
|
|
}
|
|
}
|
|
|
|
void UITextInput::insertText(const std::string& str) {
|
|
if (text.length() + str.length() > static_cast<size_t>(maxLength)) {
|
|
return; // Would exceed max length
|
|
}
|
|
|
|
text.insert(cursorPosition, str);
|
|
cursorPosition += static_cast<int>(str.length());
|
|
updateScrollOffset();
|
|
}
|
|
|
|
void UITextInput::deleteCharBefore() {
|
|
if (cursorPosition > 0) {
|
|
text.erase(cursorPosition - 1, 1);
|
|
cursorPosition--;
|
|
updateScrollOffset();
|
|
}
|
|
}
|
|
|
|
void UITextInput::deleteCharAfter() {
|
|
if (cursorPosition < static_cast<int>(text.length())) {
|
|
text.erase(cursorPosition, 1);
|
|
updateScrollOffset();
|
|
}
|
|
}
|
|
|
|
void UITextInput::moveCursor(int offset) {
|
|
int newPos = cursorPosition + offset;
|
|
newPos = std::clamp(newPos, 0, static_cast<int>(text.length()));
|
|
setCursorPosition(newPos);
|
|
}
|
|
|
|
void UITextInput::setCursorPosition(int pos) {
|
|
cursorPosition = std::clamp(pos, 0, static_cast<int>(text.length()));
|
|
updateScrollOffset();
|
|
}
|
|
|
|
std::string UITextInput::getVisibleText() const {
|
|
std::string displayText = getDisplayText();
|
|
|
|
// Simple approach: return full text (scrolling handled by offset)
|
|
// In a real implementation, we'd clip to visible characters only
|
|
return displayText;
|
|
}
|
|
|
|
float UITextInput::getCursorPixelOffset() const {
|
|
// Approximate pixel position of cursor
|
|
return cursorPosition * CHAR_WIDTH;
|
|
}
|
|
|
|
const TextInputStyle& UITextInput::getCurrentStyle() const {
|
|
switch (state) {
|
|
case TextInputState::Focused:
|
|
return focusedStyle;
|
|
case TextInputState::Disabled:
|
|
return disabledStyle;
|
|
case TextInputState::Normal:
|
|
default:
|
|
return normalStyle;
|
|
}
|
|
}
|
|
|
|
bool UITextInput::passesFilter(uint32_t ch) const {
|
|
switch (filter) {
|
|
case TextInputFilter::None:
|
|
return true;
|
|
|
|
case TextInputFilter::Alphanumeric:
|
|
return std::isalnum(ch);
|
|
|
|
case TextInputFilter::Numeric:
|
|
return std::isdigit(ch) || ch == '-'; // Allow negative numbers
|
|
|
|
case TextInputFilter::Float:
|
|
return std::isdigit(ch) || ch == '.' || ch == '-';
|
|
|
|
case TextInputFilter::NoSpaces:
|
|
return !std::isspace(ch);
|
|
|
|
default:
|
|
return true;
|
|
}
|
|
}
|
|
|
|
std::string UITextInput::getDisplayText() const {
|
|
if (passwordMode && !text.empty()) {
|
|
// Mask all characters
|
|
return std::string(text.length(), '*');
|
|
}
|
|
return text;
|
|
}
|
|
|
|
void UITextInput::updateScrollOffset() {
|
|
float cursorPixelPos = getCursorPixelOffset();
|
|
float textAreaWidth = width - 2 * PADDING;
|
|
|
|
// Scroll to keep cursor visible
|
|
if (cursorPixelPos - scrollOffset > textAreaWidth - CHAR_WIDTH) {
|
|
// Cursor would be off the right edge
|
|
scrollOffset = cursorPixelPos - textAreaWidth + CHAR_WIDTH;
|
|
} else if (cursorPixelPos < scrollOffset) {
|
|
// Cursor would be off the left edge
|
|
scrollOffset = cursorPixelPos;
|
|
}
|
|
|
|
// Clamp scroll offset
|
|
scrollOffset = std::max(0.0f, scrollOffset);
|
|
}
|
|
|
|
} // namespace grove
|