eessppeelllloo/vimix
1
0
Fork 0
mirror of https://github.com/brunoherbelin/vimix.git synced 2025-12-14 03:39:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Heuristics to prevent font displaying issues.

Browse Source
This commit is contained in:
brunoherbelin
2020-10-10 10:29:11 +02:00
parent 99f5236959
commit af11408ee9
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ImGuiToolkit.cpp
View File

@@ -17,6 +17,8 @@
#define SECOND 1000000000UL #define SECOND 1000000000UL
#define MINUTE 60000000000UL #define MINUTE 60000000000UL
#include <glad/glad.h>
#include "Resource.h" #include "Resource.h"
#include "FileDialog.h" #include "FileDialog.h"
#include "ImGuiToolkit.h" #include "ImGuiToolkit.h"
@@ -738,15 +740,19 @@ void ImGuiToolkit::SetFont(ImGuiToolkit::font_style style, const std::string &tt
{ {
// Font Atlas ImGui Management // Font Atlas ImGui Management
ImGuiIO& io = ImGui::GetIO(); ImGuiIO& io = ImGui::GetIO();
GLint max = 0;
glGetInternalformativ(GL_TEXTURE_2D, GL_RGBA8, GL_MAX_WIDTH, 1, &max);
io.Fonts->TexDesiredWidth = max / 2; // optimize use of texture depending on OpenGL drivers
// Setup font config
const ImWchar* glyph_ranges = io.Fonts->GetGlyphRangesDefault(); const ImWchar* glyph_ranges = io.Fonts->GetGlyphRangesDefault();
std::string filename = "fonts/" + ttf_font_name + ".ttf"; std::string filename = "fonts/" + ttf_font_name + ".ttf";
std::string fontname = ttf_font_name + ", " + std::to_string(pointsize) + "px"; std::string fontname = ttf_font_name + ", " + std::to_string(pointsize) + "px";
ImFontConfig font_config; ImFontConfig font_config;
fontname.copy(font_config.Name, 40); fontname.copy(font_config.Name, 40);
font_config.FontDataOwnedByAtlas = false; // data will be copied in font atlas font_config.FontDataOwnedByAtlas = false; // data will be copied in font atlas
// TODO : calculate oversampling as function of the maximum texture size font_config.OversampleH = CLAMP( oversample, 1, 5 );
font_config.OversampleH = CLAMP( oversample * 2 + 1, 1, 7 ); font_config.OversampleV = CLAMP( oversample, 1, 5 );
font_config.OversampleV = CLAMP( oversample, 0, 5 );
// read font in Resource manager // read font in Resource manager
size_t data_size = 0; size_t data_size = 0;

6
RenderingManager.cpp
View File

@@ -561,7 +561,11 @@ int RenderingWindow::pixelsforRealHeight(float milimeters)
int mm_h = 0; int mm_h = 0;
glfwGetMonitorPhysicalSize(mo, &mm_w, &mm_h); glfwGetMonitorPhysicalSize(mo, &mm_w, &mm_h);
float pixels = milimeters * static_cast<float>(glfwGetVideoMode(mo)->height) / static_cast<float>(mm_h); float pixels = milimeters;
if (mm_h > 0)
pixels *= static_cast<float>(glfwGetVideoMode(mo)->height) / static_cast<float>(mm_h);
else
pixels *= 5; // something reasonnable if monitor's physical size is unknown
return static_cast<int>( round(pixels) ); return static_cast<int>( round(pixels) );
} }