ps
/
Lumenarium
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed a problem where we were overwriting retained states

This commit is contained in:
PS 2021-04-08 12:33:00 -10:00
parent f45be27edc
commit 114ab0b5d8
1 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/app/editor/interface.h
View File

@ -424,7 +424,7 @@ ui_InterfaceReset(ui_interface* Interface)
Interface->RetainedState[i].FramesSinceAccess += 1; Interface->RetainedState[i].FramesSinceAccess += 1;
if (Interface->RetainedState[i].FramesSinceAccess > 1) if (Interface->RetainedState[i].FramesSinceAccess > 1)
{ {
Interface->RetainedState[i] = {0}; Interface->RetainedState[i].Id = {0};
} }
} }
@ -515,6 +515,9 @@ ui_GetRetainedState(ui_interface* Interface, ui_widget_id Id)
{ {
if (ui_WidgetIdsEqual(Interface->RetainedState[i].Id, Id)) if (ui_WidgetIdsEqual(Interface->RetainedState[i].Id, Id))
{ {
// NOTE(PS): If we are accessing a retained state, it shouldn't
// have been accessed longer ago than the last frame
Assert(Interface->RetainedState[i].FramesSinceAccess <= 2);
Interface->RetainedState[i].FramesSinceAccess = 0; Interface->RetainedState[i].FramesSinceAccess = 0;
Result = Interface->RetainedState + i; Result = Interface->RetainedState + i;
break; break;
@ -526,10 +529,28 @@ ui_GetRetainedState(ui_interface* Interface, ui_widget_id Id)
internal ui_widget_retained_state* internal ui_widget_retained_state*
ui_CreateRetainedState(ui_interface* Interface, ui_widget* Widget) ui_CreateRetainedState(ui_interface* Interface, ui_widget* Widget)
{ {
u64 Index = Interface->RetainedStateCount++; u64 Index = RETAINED_STATE_MAX;
if (Interface->RetainedStateCount >= RETAINED_STATE_MAX)
{
for (u32 i = 0; i < Interface->RetainedStateCount; i++)
{
if (Interface->RetainedState[i].FramesSinceAccess > 0)
{
Index = i;
break;
}
}
} else {
Index = Interface->RetainedStateCount++;
}
Assert(Index < RETAINED_STATE_MAX);
ui_widget_retained_state* Result = Interface->RetainedState + Index; ui_widget_retained_state* Result = Interface->RetainedState + Index;
Result->Id = Widget->Id; Result->Id = Widget->Id;
if (Result->EditString.Size != 256)
{
Result->EditString = PushString(Interface->Permanent, 256); Result->EditString = PushString(Interface->Permanent, 256);
}
return Result; return Result;
} }