|
@@ -603,7 +603,6 @@
|
|
#pragma warning (disable: 4127) // condition expression is constant
|
|
#pragma warning (disable: 4127) // condition expression is constant
|
|
#pragma warning (disable: 4505) // unreferenced local function has been removed (stb stuff)
|
|
#pragma warning (disable: 4505) // unreferenced local function has been removed (stb stuff)
|
|
#pragma warning (disable: 4996) // 'This function or variable may be unsafe': strcpy, strdup, sprintf, vsnprintf, sscanf, fopen
|
|
#pragma warning (disable: 4996) // 'This function or variable may be unsafe': strcpy, strdup, sprintf, vsnprintf, sscanf, fopen
|
|
-#define snprintf _snprintf
|
|
|
|
#endif
|
|
#endif
|
|
|
|
|
|
// Clang warnings with -Weverything
|
|
// Clang warnings with -Weverything
|
|
@@ -615,7 +614,6 @@
|
|
#pragma clang diagnostic ignored "-Wglobal-constructors" // warning : declaration requires a global destructor // similar to above, not sure what the exact difference it.
|
|
#pragma clang diagnostic ignored "-Wglobal-constructors" // warning : declaration requires a global destructor // similar to above, not sure what the exact difference it.
|
|
#pragma clang diagnostic ignored "-Wsign-conversion" // warning : implicit conversion changes signedness //
|
|
#pragma clang diagnostic ignored "-Wsign-conversion" // warning : implicit conversion changes signedness //
|
|
#pragma clang diagnostic ignored "-Wmissing-noreturn" // warning : function xx could be declared with attribute 'noreturn' warning // GetDefaultFontData() asserts which some implementation makes it never return.
|
|
#pragma clang diagnostic ignored "-Wmissing-noreturn" // warning : function xx could be declared with attribute 'noreturn' warning // GetDefaultFontData() asserts which some implementation makes it never return.
|
|
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"// warning : 'xx' is deprecated: The POSIX name for this item.. // for strdup used in demo code (so user can copy & paste the code)
|
|
|
|
#pragma clang diagnostic ignored "-Wint-to-void-pointer-cast" // warning : cast to 'void *' from smaller integer type 'int'
|
|
#pragma clang diagnostic ignored "-Wint-to-void-pointer-cast" // warning : cast to 'void *' from smaller integer type 'int'
|
|
#endif
|
|
#endif
|
|
#ifdef __GNUC__
|
|
#ifdef __GNUC__
|
|
@@ -4815,7 +4813,7 @@ void ImGui::SetNextWindowFocus()
|
|
ImVec2 ImGui::GetContentRegionMax()
|
|
ImVec2 ImGui::GetContentRegionMax()
|
|
{
|
|
{
|
|
ImGuiWindow* window = GetCurrentWindowRead();
|
|
ImGuiWindow* window = GetCurrentWindowRead();
|
|
- ImVec2 content_region_size = ImVec2(window->SizeContentsExplicit.x ? window->SizeContentsExplicit.x : window->Size.x - window->ScrollbarSizes.x, window->SizeContentsExplicit.y ? window->SizeContentsExplicit.y : window->Size.y - window->ScrollbarSizes.y);
|
|
|
|
|
|
+ ImVec2 content_region_size = ImVec2(window->SizeContentsExplicit.x != 0.0f ? window->SizeContentsExplicit.x : window->Size.x - window->ScrollbarSizes.x, window->SizeContentsExplicit.y != 0.0f ? window->SizeContentsExplicit.y : window->Size.y - window->ScrollbarSizes.y);
|
|
ImVec2 mx = content_region_size - window->Scroll - window->WindowPadding;
|
|
ImVec2 mx = content_region_size - window->Scroll - window->WindowPadding;
|
|
if (window->DC.ColumnsCount != 1)
|
|
if (window->DC.ColumnsCount != 1)
|
|
mx.x = ImGui::GetColumnOffset(window->DC.ColumnsCurrent + 1) - window->WindowPadding.x;
|
|
mx.x = ImGui::GetColumnOffset(window->DC.ColumnsCurrent + 1) - window->WindowPadding.x;
|
|
@@ -4843,7 +4841,7 @@ ImVec2 ImGui::GetWindowContentRegionMin()
|
|
ImVec2 ImGui::GetWindowContentRegionMax()
|
|
ImVec2 ImGui::GetWindowContentRegionMax()
|
|
{
|
|
{
|
|
ImGuiWindow* window = GetCurrentWindowRead();
|
|
ImGuiWindow* window = GetCurrentWindowRead();
|
|
- ImVec2 content_region_size = ImVec2(window->SizeContentsExplicit.x ? window->SizeContentsExplicit.x : window->Size.x, window->SizeContentsExplicit.y ? window->SizeContentsExplicit.y : window->Size.y);
|
|
|
|
|
|
+ ImVec2 content_region_size = ImVec2(window->SizeContentsExplicit.x != 0.0f ? window->SizeContentsExplicit.x : window->Size.x, window->SizeContentsExplicit.y != 0.0f ? window->SizeContentsExplicit.y : window->Size.y);
|
|
ImVec2 m = content_region_size - window->Scroll - window->WindowPadding - window->ScrollbarSizes;
|
|
ImVec2 m = content_region_size - window->Scroll - window->WindowPadding - window->ScrollbarSizes;
|
|
return m;
|
|
return m;
|
|
}
|
|
}
|
|
@@ -9163,7 +9161,7 @@ void ImGui::Columns(int columns_count, const char* id, bool border)
|
|
window->DC.ColumnsCount = columns_count;
|
|
window->DC.ColumnsCount = columns_count;
|
|
window->DC.ColumnsShowBorders = border;
|
|
window->DC.ColumnsShowBorders = border;
|
|
|
|
|
|
- const float content_region_width = window->SizeContentsExplicit.x ? window->SizeContentsExplicit.x : window->Size.x;
|
|
|
|
|
|
+ const float content_region_width = (window->SizeContentsExplicit.x != 0.0f) ? window->SizeContentsExplicit.x : window->Size.x;
|
|
window->DC.ColumnsMinX = window->DC.IndentX; // Lock our horizontal range
|
|
window->DC.ColumnsMinX = window->DC.IndentX; // Lock our horizontal range
|
|
window->DC.ColumnsMaxX = content_region_width - window->Scroll.x - ((window->Flags & ImGuiWindowFlags_NoScrollbar) ? 0 : g.Style.ScrollbarSize);// - window->WindowPadding().x;
|
|
window->DC.ColumnsMaxX = content_region_width - window->Scroll.x - ((window->Flags & ImGuiWindowFlags_NoScrollbar) ? 0 : g.Style.ScrollbarSize);// - window->WindowPadding().x;
|
|
window->DC.ColumnsStartPosY = window->DC.CursorPos.y;
|
|
window->DC.ColumnsStartPosY = window->DC.CursorPos.y;
|
|
@@ -9443,7 +9441,7 @@ void ImGui::ShowMetricsWindow(bool* p_open)
|
|
ImGui::BulletText("Callback %p, user_data %p", pcmd->UserCallback, pcmd->UserCallbackData);
|
|
ImGui::BulletText("Callback %p, user_data %p", pcmd->UserCallback, pcmd->UserCallbackData);
|
|
continue;
|
|
continue;
|
|
}
|
|
}
|
|
- bool node_open = ImGui::TreeNode((void*)(pcmd - draw_list->CmdBuffer.begin()), "Draw %-4d %s vtx, tex = %p, clip_rect = (%.0f,%.0f)..(%.0f,%.0f)", pcmd->ElemCount, draw_list->IdxBuffer.Size > 0 ? "indexed" : "non-indexed", pcmd->TextureId, pcmd->ClipRect.x, pcmd->ClipRect.y, pcmd->ClipRect.z, pcmd->ClipRect.w);
|
|
|
|
|
|
+ bool pcmd_node_open = ImGui::TreeNode((void*)(pcmd - draw_list->CmdBuffer.begin()), "Draw %-4d %s vtx, tex = %p, clip_rect = (%.0f,%.0f)..(%.0f,%.0f)", pcmd->ElemCount, draw_list->IdxBuffer.Size > 0 ? "indexed" : "non-indexed", pcmd->TextureId, pcmd->ClipRect.x, pcmd->ClipRect.y, pcmd->ClipRect.z, pcmd->ClipRect.w);
|
|
if (show_clip_rects && ImGui::IsItemHovered())
|
|
if (show_clip_rects && ImGui::IsItemHovered())
|
|
{
|
|
{
|
|
ImRect clip_rect = pcmd->ClipRect;
|
|
ImRect clip_rect = pcmd->ClipRect;
|
|
@@ -9454,7 +9452,7 @@ void ImGui::ShowMetricsWindow(bool* p_open)
|
|
clip_rect.Floor(); overlay_draw_list->AddRect(clip_rect.Min, clip_rect.Max, IM_COL32(255,255,0,255));
|
|
clip_rect.Floor(); overlay_draw_list->AddRect(clip_rect.Min, clip_rect.Max, IM_COL32(255,255,0,255));
|
|
vtxs_rect.Floor(); overlay_draw_list->AddRect(vtxs_rect.Min, vtxs_rect.Max, IM_COL32(255,0,255,255));
|
|
vtxs_rect.Floor(); overlay_draw_list->AddRect(vtxs_rect.Min, vtxs_rect.Max, IM_COL32(255,0,255,255));
|
|
}
|
|
}
|
|
- if (!node_open)
|
|
|
|
|
|
+ if (!pcmd_node_open)
|
|
continue;
|
|
continue;
|
|
for (int i = elem_offset; i+2 < elem_offset + (int)pcmd->ElemCount; i += 3)
|
|
for (int i = elem_offset; i+2 < elem_offset + (int)pcmd->ElemCount; i += 3)
|
|
{
|
|
{
|