mirror of
https://github.com/ocornut/imgui.git
synced 2026-05-27 19:15:24 +08:00
Style Editor: disable FontScaleDpi field when io.ConfigDpiScaleFonts is set.
Amend d85e22d20
This commit is contained in:
+3
-3
@@ -8499,10 +8499,10 @@ void ImGui::ShowStyleEditor(ImGuiStyle* ref)
|
|||||||
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());
|
||||||
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, 4.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();
|
||||||
|
|
||||||
// Simplified Settings (expose floating-pointer border sizes as boolean representing 0.0f or 1.0f)
|
// Simplified Settings (expose floating-pointer border sizes as boolean representing 0.0f or 1.0f)
|
||||||
if (SliderFloat("FrameRounding", &style.FrameRounding, 0.0f, 12.0f, "%.0f"))
|
if (SliderFloat("FrameRounding", &style.FrameRounding, 0.0f, 12.0f, "%.0f"))
|
||||||
|
|||||||
Reference in New Issue
Block a user