mirror of
https://github.com/ocornut/imgui.git
synced 2026-01-11 00:04:24 +00:00
Fonts: set a maximum font size of 512.0f at ImGui:: API level to reduce edge cases.
This commit is contained in:
parent
b7e5d76c79
commit
51b3495ad8
4 changed files with 9 additions and 4 deletions
|
|
@ -45,6 +45,9 @@ Other changes:
|
||||||
|
|
||||||
- Fonts: added ImFontAtlas::SetFontLoader() to dynamically change font
|
- Fonts: added ImFontAtlas::SetFontLoader() to dynamically change font
|
||||||
loader at runtime without using internal API. (#8752, #8465)
|
loader at runtime without using internal API. (#8752, #8465)
|
||||||
|
- Fonts: set a maximum font size of 512.0f at ImGui:: API level to reduce
|
||||||
|
edge cases (e.g. out of memory errors). ImDrawList:: API doesn't have the
|
||||||
|
constraint. (#8758)
|
||||||
- Textures: Fixed support for `#define ImTextureID_Invalid` to non-zero value:
|
- Textures: Fixed support for `#define ImTextureID_Invalid` to non-zero value:
|
||||||
ImTextureData() was incorrectly cleared with zeroes. (#8745) [@rachit7645]
|
ImTextureData() was incorrectly cleared with zeroes. (#8745) [@rachit7645]
|
||||||
- Demo: Added "Text -> Font Size" demo section. (#8738) [@Demonese]
|
- Demo: Added "Text -> Font Size" demo section. (#8738) [@Demonese]
|
||||||
|
|
|
||||||
|
|
@ -8824,7 +8824,7 @@ void ImGui::UpdateCurrentFontSize(float restore_font_size_after_scaling)
|
||||||
// - We started rounding in 1.90 WIP (18991) as our layout system currently doesn't support non-rounded font size well yet.
|
// - We started rounding in 1.90 WIP (18991) as our layout system currently doesn't support non-rounded font size well yet.
|
||||||
// - We may support it better later and remove this rounding.
|
// - We may support it better later and remove this rounding.
|
||||||
final_size = GetRoundedFontSize(final_size);
|
final_size = GetRoundedFontSize(final_size);
|
||||||
final_size = ImMax(1.0f, final_size);
|
final_size = ImClamp(final_size, 1.0f, IMGUI_FONT_SIZE_MAX);
|
||||||
if (g.Font != NULL && (g.IO.BackendFlags & ImGuiBackendFlags_RendererHasTextures))
|
if (g.Font != NULL && (g.IO.BackendFlags & ImGuiBackendFlags_RendererHasTextures))
|
||||||
g.Font->CurrentRasterizerDensity = g.FontRasterizerDensity;
|
g.Font->CurrentRasterizerDensity = g.FontRasterizerDensity;
|
||||||
g.FontSize = final_size;
|
g.FontSize = final_size;
|
||||||
|
|
@ -15871,9 +15871,9 @@ void ImGui::ShowFontAtlas(ImFontAtlas* atlas)
|
||||||
style._NextFrameFontSizeBase = style.FontSizeBase; // FIXME: Temporary hack until we finish remaining work.
|
style._NextFrameFontSizeBase = style.FontSizeBase; // FIXME: Temporary hack until we finish remaining work.
|
||||||
SameLine(0.0f, 0.0f); Text(" (out %.2f)", GetFontSize());
|
SameLine(0.0f, 0.0f); Text(" (out %.2f)", GetFontSize());
|
||||||
SameLine(); MetricsHelpMarker("- This is scaling font only. General scaling will come later.");
|
SameLine(); MetricsHelpMarker("- This is scaling font only. General scaling will come later.");
|
||||||
DragFloat("FontScaleMain", &style.FontScaleMain, 0.02f, 0.5f, 5.0f);
|
DragFloat("FontScaleMain", &style.FontScaleMain, 0.02f, 0.5f, 4.0f);
|
||||||
//BeginDisabled(io.ConfigDpiScaleFonts);
|
//BeginDisabled(io.ConfigDpiScaleFonts);
|
||||||
DragFloat("FontScaleDpi", &style.FontScaleDpi, 0.02f, 0.5f, 5.0f);
|
DragFloat("FontScaleDpi", &style.FontScaleDpi, 0.02f, 0.5f, 4.0f);
|
||||||
//SetItemTooltip("When io.ConfigDpiScaleFonts is set, this value is automatically overwritten.");
|
//SetItemTooltip("When io.ConfigDpiScaleFonts is set, this value is automatically overwritten.");
|
||||||
//EndDisabled();
|
//EndDisabled();
|
||||||
if ((io.BackendFlags & ImGuiBackendFlags_RendererHasTextures) == 0)
|
if ((io.BackendFlags & ImGuiBackendFlags_RendererHasTextures) == 0)
|
||||||
|
|
|
||||||
|
|
@ -8282,7 +8282,7 @@ void ImGui::ShowStyleEditor(ImGuiStyle* ref)
|
||||||
SameLine(0.0f, 0.0f); Text(" (out %.2f)", GetFontSize());
|
SameLine(0.0f, 0.0f); Text(" (out %.2f)", GetFontSize());
|
||||||
DragFloat("FontScaleMain", &style.FontScaleMain, 0.02f, 0.5f, 4.0f);
|
DragFloat("FontScaleMain", &style.FontScaleMain, 0.02f, 0.5f, 4.0f);
|
||||||
//BeginDisabled(GetIO().ConfigDpiScaleFonts);
|
//BeginDisabled(GetIO().ConfigDpiScaleFonts);
|
||||||
DragFloat("FontScaleDpi", &style.FontScaleDpi, 0.02f, 0.5f, 5.0f);
|
DragFloat("FontScaleDpi", &style.FontScaleDpi, 0.02f, 0.5f, 4.0f);
|
||||||
//SetItemTooltip("When io.ConfigDpiScaleFonts is set, this value is automatically overwritten.");
|
//SetItemTooltip("When io.ConfigDpiScaleFonts is set, this value is automatically overwritten.");
|
||||||
//EndDisabled();
|
//EndDisabled();
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -3711,6 +3711,8 @@ typedef ImFontLoader ImFontBuilderIO; // [renamed/changed in 1.92] The types are
|
||||||
// [SECTION] ImFontAtlas internal API
|
// [SECTION] ImFontAtlas internal API
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
|
||||||
|
#define IMGUI_FONT_SIZE_MAX (512.0f)
|
||||||
|
|
||||||
// Helpers: ImTextureRef ==/!= operators provided as convenience
|
// Helpers: ImTextureRef ==/!= operators provided as convenience
|
||||||
// (note that _TexID and _TexData are never set simultaneously)
|
// (note that _TexID and _TexData are never set simultaneously)
|
||||||
inline bool operator==(const ImTextureRef& lhs, const ImTextureRef& rhs) { return lhs._TexID == rhs._TexID && lhs._TexData == rhs._TexData; }
|
inline bool operator==(const ImTextureRef& lhs, const ImTextureRef& rhs) { return lhs._TexID == rhs._TexID && lhs._TexData == rhs._TexData; }
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue