ilusha/Modules
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

focus locking stack

Browse source
This commit is contained in:
IlyaShurupov 2024-11-05 20:32:59 +03:00
parent 1bbce78a2e
commit b5e490a0f8
7 changed files with 34 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Widgets/private/managers/DebugManager.cpp
View file

@ -113,8 +113,8 @@ void DebugManager::recursiveDraw(Canvas& canvas, Widget* active, const Vec2F& po
canvas.text((active->mDebug.id + ":" + std::to_string(depthOrder)).c_str(), area, 22, Canvas::Align::LC, 2, color);
}
if (active == mRootWidget->mUpdateManager.mFocusLockWidget) {
canvas.frame(area, { 0, 1, 0, 1 });
if (mRootWidget->mUpdateManager.mFocusLockStack.find(active)) {
canvas.frame(area, { 0, 1, 0, 0.5f });
}
if (active->mFlags.get(Widget::IN_FOCUS)) {

28
Widgets/private/managers/UpdateManager.cpp
View file

@ -75,16 +75,16 @@ Widget* UpdateManager::findFocusWidget(Widget* root, EventHandler& events) {
mInFocusWidget = nullptr;
findMouseFocusWidget(root, &mInFocusWidget, events.getPointer());
if (mFocusLockWidget) {
if (mFocusLockStack.size()) {
bool hasLockedWidget = false;
for (auto iter = mInFocusWidget; iter; iter = iter->mParent) {
if (iter == mFocusLockWidget) {
if (iter == mFocusLockStack.last()) {
hasLockedWidget = true;
break;
}
}
if (!hasLockedWidget) {
mInFocusWidget = mFocusLockWidget;
mInFocusWidget = mFocusLockStack.last();
}
}
@ -212,10 +212,24 @@ void UpdateManager::procWidget(Widget* widget, EventHandler& events, bool withEv
}
void UpdateManager::lockFocus(tp::Widget* widget) {
mFocusLockWidget = widget;
DEBUG_ASSERT(mFocusLockStack.find(widget) == nullptr)
// TODO : check that widget is a child of top of the stack
mFocusLockStack.pushBack(widget);
}
void UpdateManager::freeFocus(tp::Widget* widget) {
DEBUG_ASSERT(mFocusLockWidget == widget)
mFocusLockWidget = nullptr;
}
DEBUG_ASSERT(mFocusLockStack.last() == widget)
mFocusLockStack.popBack();
}
bool UpdateManager::canRemoveWidget(Widget* widget) const {
if (auto node = mFocusLockStack.find(widget)) {
if (node->next) return false;
}
return true;
}
void UpdateManager::removeWidget(Widget* widget) {
freeFocus(widget);
}