|
@@ -1433,7 +1433,7 @@ static const ImU32 GCrc32LookupTable[256] =
|
|
|
// Known size hash
|
|
|
// It is ok to call ImHashData on a string with known length but the ### operator won't be supported.
|
|
|
// FIXME-OPT: Replace with e.g. FNV1a hash? CRC32 pretty much randomly access 1KB. Need to do proper measurements.
|
|
|
-ImU32 ImHashData(const void* data_p, size_t data_size, ImU32 seed)
|
|
|
+ImGuiID ImHashData(const void* data_p, size_t data_size, ImU32 seed)
|
|
|
{
|
|
|
ImU32 crc = ~seed;
|
|
|
const unsigned char* data = (const unsigned char*)data_p;
|
|
@@ -1449,7 +1449,7 @@ ImU32 ImHashData(const void* data_p, size_t data_size, ImU32 seed)
|
|
|
// - If we reach ### in the string we discard the hash so far and reset to the seed.
|
|
|
// - We don't do 'current += 2; continue;' after handling ### to keep the code smaller/faster (measured ~10% diff in Debug build)
|
|
|
// FIXME-OPT: Replace with e.g. FNV1a hash? CRC32 pretty much randomly access 1KB. Need to do proper measurements.
|
|
|
-ImU32 ImHashStr(const char* data_p, size_t data_size, ImU32 seed)
|
|
|
+ImGuiID ImHashStr(const char* data_p, size_t data_size, ImU32 seed)
|
|
|
{
|
|
|
seed = ~seed;
|
|
|
ImU32 crc = seed;
|
|
@@ -6405,7 +6405,7 @@ bool ImGui::IsWindowFocused(ImGuiFocusedFlags flags)
|
|
|
// If you want a window to never be focused, you may use the e.g. NoInputs flag.
|
|
|
bool ImGui::IsWindowNavFocusable(ImGuiWindow* window)
|
|
|
{
|
|
|
- return window->Active && window == window->RootWindow && !(window->Flags & ImGuiWindowFlags_NoNavFocus);
|
|
|
+ return window->WasActive && window == window->RootWindow && !(window->Flags & ImGuiWindowFlags_NoNavFocus);
|
|
|
}
|
|
|
|
|
|
float ImGui::GetWindowWidth()
|
|
@@ -7002,6 +7002,7 @@ void ImGuiStackSizes::CompareWithCurrentState()
|
|
|
{
|
|
|
ImGuiContext& g = *GImGui;
|
|
|
ImGuiWindow* window = g.CurrentWindow;
|
|
|
+ IM_UNUSED(window);
|
|
|
|
|
|
// Window stacks
|
|
|
// NOT checking: DC.ItemWidth, DC.TextWrapPos (per window) to allow user to conveniently push once and not pop (they are cleared on Begin)
|