zhangengru/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy.git synced 2025-03-20 07:40:02 +08:00
Code Issues Projects Wiki Activity

Update font awesome and migrate to v6 headers.

Browse Source
This commit is contained in:
Bartosz Taudul
2022-08-17 12:07:38 +02:00
parent ef35c01e14
commit 4bcb59bbe6
28 changed files with 13638 additions and 11229 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/TracyBadVersion.cpp
+4 -4
View File
@@ -2,7 +2,7 @@
#include "imgui.h"
#include "IconsFontAwesome5.h"
#include "IconsFontAwesome6.h"
#include "TracyBadVersion.hpp"
#include "TracyImGui.hpp"
#include "TracyWeb.hpp"
@@ -38,7 +38,7 @@ void BadVersionImpl( BadVersionState& badVer, ImFont* big )
if( ImGui::BeginPopupModal( "Bad file", nullptr, ImGuiWindowFlags_AlwaysAutoResize ) )
{
ImGui::PushFont( big );
TextCentered( ICON_FA_EXCLAMATION_TRIANGLE );
TextCentered( ICON_FA_TRIANGLE_EXCLAMATION );
ImGui::PopFont();
ImGui::Text( "The file you are trying to open is not a Tracy dump." );
ImGui::Separator();
@@ -52,7 +52,7 @@ void BadVersionImpl( BadVersionState& badVer, ImFont* big )
if( ImGui::BeginPopupModal( "File read error", nullptr, ImGuiWindowFlags_AlwaysAutoResize ) )
{
ImGui::PushFont( big );
TextCentered( ICON_FA_EXCLAMATION_TRIANGLE );
TextCentered( ICON_FA_TRIANGLE_EXCLAMATION );
ImGui::PopFont();
ImGui::Text( "The file you are trying to open cannot be mapped to memory." );
ImGui::Separator();
@@ -66,7 +66,7 @@ void BadVersionImpl( BadVersionState& badVer, ImFont* big )
if( ImGui::BeginPopupModal( "Unsupported file version", nullptr, ImGuiWindowFlags_AlwaysAutoResize ) )
{
ImGui::PushFont( big );
TextCentered( ICON_FA_CLOUD_DOWNLOAD_ALT );
TextCentered( ICON_FA_CLOUD_ARROW_DOWN );
ImGui::PopFont();
ImGui::Text( "The file you are trying to open is unsupported.\nYou should update to Tracy %i.%i.%i or newer and try again.", badVer.version >> 16, ( badVer.version >> 8 ) & 0xFF, badVer.version & 0xFF );
ImGui::Separator();