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
profiler/build/win32/Tracy.vcxproj
+1 -1
View File
@@ -239,7 +239,7 @@
<ClInclude Include="..\..\..\public\common\TracyYield.hpp" />
<ClInclude Include="..\..\..\public\common\tracy_lz4.hpp" />
<ClInclude Include="..\..\..\public\common\tracy_lz4hc.hpp" />
<ClInclude Include="..\..\..\server\IconsFontAwesome5.h" />
<ClInclude Include="..\..\..\server\IconsFontAwesome6.h" />
<ClInclude Include="..\..\..\server\TracyBadVersion.hpp" />
<ClInclude Include="..\..\..\server\TracyBuzzAnim.hpp" />
<ClInclude Include="..\..\..\server\TracyCharUtil.hpp" />
profiler/build/win32/Tracy.vcxproj.filters
+3 -3
View File
@@ -419,9 +419,6 @@
<ClInclude Include="..\..\..\server\TracyBuzzAnim.hpp">
<Filter>server</Filter>
</ClInclude>
<ClInclude Include="..\..\..\server\IconsFontAwesome5.h">
<Filter>server</Filter>
</ClInclude>
<ClInclude Include="..\..\..\server\TracyStorage.hpp">
<Filter>server</Filter>
</ClInclude>
@@ -725,6 +722,9 @@
<ClInclude Include="..\..\..\server\TracyUtility.hpp">
<Filter>server</Filter>
</ClInclude>
<ClInclude Include="..\..\..\server\IconsFontAwesome6.h">
<Filter>server</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Natvis Include="DebugVis.natvis" />
profiler/src/Fonts.cpp
+1 -1
View File
@@ -4,7 +4,7 @@
#include "Fonts.hpp"
#include "misc/freetype/imgui_freetype.h"
#include "imgui/imgui_impl_opengl3.h"
#include "../../server/IconsFontAwesome5.h"
#include "../../server/IconsFontAwesome6.h"
#include "font/DroidSans.hpp"
#include "font/FiraCodeRetina.hpp"
profiler/src/font/FontAwesomeSolid.hpp
+12135 -10141
View File
File diff suppressed because it is too large Load Diff
profiler/src/main.cpp
+5 -5
View File
@@ -46,7 +46,7 @@
#include "../../server/TracyWeb.hpp"
#include "../../server/TracyWorker.hpp"
#include "../../server/TracyVersion.hpp"
#include "../../server/IconsFontAwesome5.h"
#include "../../server/IconsFontAwesome6.h"
#include "icon.hpp"
@@ -404,13 +404,13 @@ static void DrawContents()
tracy::OpenWebpage( "https://github.com/wolfpld/tracy/releases" );
}
ImGui::SameLine();
if( ImGui::Button( ICON_FA_GLOBE_AMERICAS " Web" ) )
if( ImGui::Button( ICON_FA_EARTH_AMERICAS " Web" ) )
{
ImGui::OpenPopup( "web" );
}
if( ImGui::BeginPopup( "web" ) )
{
if( ImGui::Selectable( ICON_FA_HOME " Tracy Profiler home page" ) )
if( ImGui::Selectable( ICON_FA_HOUSE_CHIMNEY " Tracy Profiler home page" ) )
{
tracy::OpenWebpage( "https://github.com/wolfpld/tracy" );
}
@@ -585,12 +585,12 @@ static void DrawContents()
if( filt->IsActive() )
{
ImGui::SameLine();
tracy::TextColoredUnformatted( 0xFF00FFFF, ICON_FA_EXCLAMATION_TRIANGLE );
tracy::TextColoredUnformatted( 0xFF00FFFF, ICON_FA_TRIANGLE_EXCLAMATION );
tracy::TooltipIfHovered( "Filters are active" );
if( showFilter )
{
ImGui::SameLine();
if( ImGui::SmallButton( ICON_FA_BACKSPACE " Clear" ) )
if( ImGui::SmallButton( ICON_FA_DELETE_LEFT " Clear" ) )
{
filt->Clear();
}