This commit implements Phase 7 of the UIModule, adding advanced features that make the UI system production-ready. ## Phase 7.1 - UIScrollPanel New scrollable container widget with: - Vertical and horizontal scrolling (configurable) - Mouse wheel support with smooth scrolling - Drag-to-scroll functionality (drag content or scrollbar) - Interactive scrollbar with proportional thumb - Automatic content size calculation - Visibility culling for performance - Full styling support (colors, borders, scrollbar) Files added: - modules/UIModule/Widgets/UIScrollPanel.h - modules/UIModule/Widgets/UIScrollPanel.cpp - modules/UIModule/Core/UIContext.h (added mouseWheelDelta) - modules/UIModule/UIModule.cpp (mouse wheel event routing) ## Phase 7.2 - Tooltips Smart tooltip system with: - Hover delay (500ms default) - Automatic positioning with edge avoidance - Semi-transparent background with border - Per-widget tooltip text via JSON - Tooltip property on all UIWidget types - Renders on top of all UI elements Files added: - modules/UIModule/Core/UITooltip.h - modules/UIModule/Core/UITooltip.cpp - modules/UIModule/Core/UIWidget.h (added tooltip property) - modules/UIModule/Core/UITree.cpp (tooltip parsing) ## Tests Added comprehensive visual tests: - test_28_ui_scroll.cpp - ScrollPanel with 35+ items - test_29_ui_advanced.cpp - Tooltips on various widgets - assets/ui/test_scroll.json - ScrollPanel layout - assets/ui/test_tooltips.json - Tooltips layout ## Documentation - docs/UI_MODULE_PHASE7_COMPLETE.md - Complete Phase 7 docs - docs/PROMPT_UI_MODULE_PHASE6.md - Phase 6 & 7 prompt - Updated CMakeLists.txt for new files and tests ## UIModule Status UIModule is now feature-complete with: ✅ 9 widget types (Panel, Label, Button, Image, Slider, Checkbox, ProgressBar, TextInput, ScrollPanel) ✅ Flexible layout system (vertical, horizontal, stack, absolute) ✅ Theme and style system ✅ Complete event system ✅ Tooltips with smart positioning ✅ Hot-reload support ✅ Comprehensive tests (Phases 1-7) 🚀 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
120 lines
3.2 KiB
C++
120 lines
3.2 KiB
C++
#include "UISlider.h"
|
|
#include "../Core/UIContext.h"
|
|
#include "../Rendering/UIRenderer.h"
|
|
#include <algorithm>
|
|
#include <cmath>
|
|
|
|
namespace grove {
|
|
|
|
void UISlider::update(UIContext& ctx, float deltaTime) {
|
|
// Check if mouse is over slider
|
|
isHovered = containsPoint(ctx.mouseX, ctx.mouseY);
|
|
|
|
// Handle dragging
|
|
if (isDragging && ctx.mouseDown) {
|
|
onMouseDrag(ctx.mouseX, ctx.mouseY);
|
|
} else if (isDragging && !ctx.mouseDown) {
|
|
isDragging = false;
|
|
}
|
|
|
|
// Update children
|
|
updateChildren(ctx, deltaTime);
|
|
}
|
|
|
|
void UISlider::render(UIRenderer& renderer) {
|
|
// Render track (background)
|
|
renderer.drawRect(absX, absY, width, height, trackColor);
|
|
|
|
// Render fill (progress)
|
|
if (horizontal) {
|
|
float fillWidth = (value - minValue) / (maxValue - minValue) * width;
|
|
renderer.drawRect(absX, absY, fillWidth, height, fillColor);
|
|
} else {
|
|
float fillHeight = (value - minValue) / (maxValue - minValue) * height;
|
|
renderer.drawRect(absX, absY + height - fillHeight, width, fillHeight, fillColor);
|
|
}
|
|
|
|
// Render handle
|
|
float handleX, handleY;
|
|
calculateHandlePosition(handleX, handleY);
|
|
|
|
// Handle is a small square
|
|
float halfHandle = handleSize * 0.5f;
|
|
renderer.drawRect(
|
|
handleX - halfHandle,
|
|
handleY - halfHandle,
|
|
handleSize,
|
|
handleSize,
|
|
handleColor
|
|
);
|
|
|
|
// Render children on top
|
|
renderChildren(renderer);
|
|
}
|
|
|
|
bool UISlider::containsPoint(float px, float py) const {
|
|
return px >= absX && px < absX + width &&
|
|
py >= absY && py < absY + height;
|
|
}
|
|
|
|
bool UISlider::onMouseButton(int button, bool pressed, float x, float y) {
|
|
if (button == 0 && pressed && containsPoint(x, y)) {
|
|
isDragging = true;
|
|
onMouseDrag(x, y);
|
|
return true;
|
|
}
|
|
if (button == 0 && !pressed && isDragging) {
|
|
isDragging = false;
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
void UISlider::onMouseDrag(float x, float y) {
|
|
float newValue = calculateValueFromPosition(x, y);
|
|
setValue(newValue);
|
|
}
|
|
|
|
void UISlider::setValue(float newValue) {
|
|
// Clamp to range
|
|
newValue = std::max(minValue, std::min(maxValue, newValue));
|
|
|
|
// Apply step if needed
|
|
if (step > 0.0f) {
|
|
newValue = std::round(newValue / step) * step;
|
|
}
|
|
|
|
// Only update if changed
|
|
if (newValue != value) {
|
|
value = newValue;
|
|
// Value changed event will be published by UIModule
|
|
}
|
|
}
|
|
|
|
void UISlider::calculateHandlePosition(float& handleX, float& handleY) const {
|
|
float t = (value - minValue) / (maxValue - minValue);
|
|
|
|
if (horizontal) {
|
|
handleX = absX + t * width;
|
|
handleY = absY + height * 0.5f;
|
|
} else {
|
|
handleX = absX + width * 0.5f;
|
|
handleY = absY + height - (t * height);
|
|
}
|
|
}
|
|
|
|
float UISlider::calculateValueFromPosition(float x, float y) const {
|
|
float t;
|
|
|
|
if (horizontal) {
|
|
t = (x - absX) / width;
|
|
} else {
|
|
t = 1.0f - (y - absY) / height;
|
|
}
|
|
|
|
t = std::max(0.0f, std::min(1.0f, t));
|
|
return minValue + t * (maxValue - minValue);
|
|
}
|
|
|
|
} // namespace grove
|