diff --git a/android/app/src/main/java/MainActivity.kt b/android/app/src/main/java/MainActivity.kt index 3ea3c3b5a..9306c4ffa 100644 --- a/android/app/src/main/java/MainActivity.kt +++ b/android/app/src/main/java/MainActivity.kt @@ -120,7 +120,6 @@ class MainActivity : NativeActivity() { extractDir(aman, fdir + "/resources", "resources"); extractDir(aman, fdir + "/plugins", "plugins"); extractFile(aman, fdir + "/satdump_cfg.json", "satdump_cfg.json"); - extractFile(aman, fdir + "/Roboto-Medium.ttf", "Roboto-Medium.ttf"); //createIfDoesntExist(fdir + "/plugins"); return fdir; diff --git a/src-core/core/style.cpp b/src-core/core/style.cpp index b72dbd5b3..9ad78e58e 100644 --- a/src-core/core/style.cpp +++ b/src-core/core/style.cpp @@ -27,7 +27,7 @@ namespace style setFonts(resources::getResourcePath("fonts/Roboto-Medium.tff")); ImGui::StyleColorsDark(); - //ImGui::StyleColorsLight(); + // ImGui::StyleColorsLight(); return true; } @@ -180,15 +180,16 @@ namespace style ImGui::PopStyleColor(3); } - void setFonts(std::string fontName){ - static const ImWchar icons_ranges[] = { 0xe000, 0xfd46, 0 }; + void setFonts(std::string fontName) + { + static const ImWchar icons_ranges[] = {0xe000, 0xfd46, 0}; ImFontConfig config; config.MergeMode = true; - baseFont = ImGui::GetIO().Fonts->AddFontFromFileTTF(fontName.c_str(), 16.0f); - baseFont = ImGui::GetIO().Fonts->AddFontFromFileTTF(resources::getResourcePath("fonts/3270-Medium Nerd Font Complete.ttf").c_str(), 16.0f, &config, icons_ranges); - bigFont = ImGui::GetIO().Fonts->AddFontFromFileTTF(fontName.c_str(), 45.0f); - //bigFont = ImGui::GetIO().Fonts->AddFontFromFileTTF(resources::getResourcePath("fonts/3270-Medium Nerd Font Complete.ttf").c_str(), 45.0f, &config, icons_ranges); - hugeFont = ImGui::GetIO().Fonts->AddFontFromFileTTF(fontName.c_str(), 128.0f); - //hugeFont = ImGui::GetIO().Fonts->AddFontFromFileTTF(resources::getResourcePath("fonts/3270-Medium Nerd Font Complete.ttf").c_str(), 128.0f, &config, icons_ranges); + baseFont = ImGui::GetIO().Fonts->AddFontFromFileTTF(fontName.c_str(), 16.0f * ui_scale); + baseFont = ImGui::GetIO().Fonts->AddFontFromFileTTF(resources::getResourcePath("fonts/3270-Medium Nerd Font Complete.ttf").c_str(), 16.0f * ui_scale, &config, icons_ranges); + bigFont = ImGui::GetIO().Fonts->AddFontFromFileTTF(fontName.c_str(), 45.0f * ui_scale); + // bigFont = ImGui::GetIO().Fonts->AddFontFromFileTTF(resources::getResourcePath("fonts/3270-Medium Nerd Font Complete.ttf").c_str(), 45.0f, &config, icons_ranges); + hugeFont = ImGui::GetIO().Fonts->AddFontFromFileTTF(fontName.c_str(), 128.0f * ui_scale); + // hugeFont = ImGui::GetIO().Fonts->AddFontFromFileTTF(resources::getResourcePath("fonts/3270-Medium Nerd Font Complete.ttf").c_str(), 128.0f, &config, icons_ranges); } } \ No newline at end of file diff --git a/src-interface/viewer/viewer.cpp b/src-interface/viewer/viewer.cpp index e0eaa2a9e..8c2bfb254 100644 --- a/src-interface/viewer/viewer.cpp +++ b/src-interface/viewer/viewer.cpp @@ -23,7 +23,7 @@ namespace satdump // loadDatasetInViewer("/home/alan/Documents/SatDump_ReWork/build/metop_ahrpt_new/dataset.json"); - loadDatasetInViewer("/home/zbyszek/Downloads/metopC_15-04_1125/dataset.json"); + // loadDatasetInViewer("/home/zbyszek/Downloads/metopC_15-04_1125/dataset.json"); // loadProductsInViewer("/home/alan/Documents/SatDump_ReWork/build/noaa_mhs_test/AMSU/product.cbor", "NOAA-19 HRPT"); // loadProductsInViewer("/home/alan/Documents/SatDump_ReWork/build/metop_ahrpt_new/AVHRR/product.cbor", "MetOp-B AHRPT");