Use vector instea dof plain array for Roboto font

Github thinks it's c...
pull/130/head
Peter Repukat 3 years ago
parent 209d80c1ea
commit eb361d581f

@ -38,7 +38,7 @@ Overlay::Overlay(
io.Fonts->Clear(); // clear fonts if you loaded some before (even if only default one was loaded) io.Fonts->Clear(); // clear fonts if you loaded some before (even if only default one was loaded)
auto fontconf = ImFontConfig{}; auto fontconf = ImFontConfig{};
fontconf.FontDataOwnedByAtlas = false; fontconf.FontDataOwnedByAtlas = false;
io.Fonts->AddFontFromMemoryTTF(Roboto_Regular_ttf, Roboto_Regular_ttf_len, 24, &fontconf); io.Fonts->AddFontFromMemoryTTF(Roboto_Regular_ttf.data(), Roboto_Regular_ttf.size(), 24, &fontconf);
ImGui::SFML::UpdateFontTexture(); // important call: updates font texture ImGui::SFML::UpdateFontTexture(); // important call: updates font texture
#ifdef _WIN32 #ifdef _WIN32

@ -51,8 +51,8 @@ END
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 0,0,0,0657006 FILEVERSION 0,0,0,5419086
PRODUCTVERSION 0,0,0,0657006 PRODUCTVERSION 0,0,0,5419086
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -69,12 +69,12 @@ BEGIN
BEGIN BEGIN
VALUE "CompanyName", "Peter Repukat - FlatspotSoftware" VALUE "CompanyName", "Peter Repukat - FlatspotSoftware"
VALUE "FileDescription", "GlosSI - SteamTarget" VALUE "FileDescription", "GlosSI - SteamTarget"
VALUE "FileVersion", "0.0.0.f657dd6" VALUE "FileVersion", "0.0.0.5419d86"
VALUE "InternalName", "GlosSITarget" VALUE "InternalName", "GlosSITarget"
VALUE "LegalCopyright", "Copyright (C) 2021 Peter Repukat - FlatspotSoftware" VALUE "LegalCopyright", "Copyright (C) 2021 Peter Repukat - FlatspotSoftware"
VALUE "OriginalFilename", "GlosSITarget.exe" VALUE "OriginalFilename", "GlosSITarget.exe"
VALUE "ProductName", "GlosSI" VALUE "ProductName", "GlosSI"
VALUE "ProductVersion", "0.0.0.f657dd6" VALUE "ProductVersion", "0.0.0.5419d86"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"
@ -327,6 +327,10 @@ END

@ -16,8 +16,9 @@ limitations under the License.
#pragma once #pragma once
// This is way easier than to package resources or lookup the app file path dynamically... // This is way easier than to package resources or lookup the app file path dynamically...
#include <vector>
unsigned char Roboto_Regular_ttf[] = { std::vector<uint8_t> Roboto_Regular_ttf = {
0x00, 0x01, 0x00, 0x00, 0x00, 0x12, 0x01, 0x00, 0x00, 0x04, 0x00, 0x20, 0x00, 0x01, 0x00, 0x00, 0x00, 0x12, 0x01, 0x00, 0x00, 0x04, 0x00, 0x20,
0x47, 0x44, 0x45, 0x46, 0xb4, 0x42, 0xb0, 0x82, 0x00, 0x02, 0x1b, 0x84, 0x47, 0x44, 0x45, 0x46, 0xb4, 0x42, 0xb0, 0x82, 0x00, 0x02, 0x1b, 0x84,
0x00, 0x00, 0x02, 0x62, 0x47, 0x50, 0x4f, 0x53, 0xff, 0x1a, 0x12, 0xd7, 0x00, 0x00, 0x02, 0x62, 0x47, 0x50, 0x4f, 0x53, 0xff, 0x1a, 0x12, 0xd7,
@ -14040,5 +14041,4 @@ unsigned char Roboto_Regular_ttf[] = {
0x00, 0x0a, 0x02, 0x3e, 0x00, 0x7a, 0x00, 0x73, 0x00, 0x74, 0x02, 0x3f, 0x00, 0x0a, 0x02, 0x3e, 0x00, 0x7a, 0x00, 0x73, 0x00, 0x74, 0x02, 0x3f,
0x02, 0x40, 0x02, 0x41, 0x02, 0x42, 0x02, 0x43, 0x02, 0x44, 0x00, 0x02, 0x02, 0x40, 0x02, 0x41, 0x02, 0x42, 0x02, 0x43, 0x02, 0x44, 0x00, 0x02,
0x00, 0x01, 0x00, 0x14, 0x00, 0x1d, 0x00, 0x00 0x00, 0x01, 0x00, 0x14, 0x00, 0x1d, 0x00, 0x00
}; };
unsigned int Roboto_Regular_ttf_len = 168260;
Loading…
Cancel
Save