mirror of
https://github.com/ocornut/imgui.git
synced 2026-01-11 00:04:24 +00:00
Internals: amend f806c76 to better match docking + fixed unused static forward declaration warning.
This commit is contained in:
parent
d0524df887
commit
e4576914cb
3 changed files with 9 additions and 10 deletions
|
|
@ -1942,7 +1942,7 @@ struct ImGuiContext
|
|||
ImFont* Font; // (Shortcut) == FontStack.empty() ? IO.Font : FontStack.back()
|
||||
float FontSize; // (Shortcut) == FontBaseSize * g.CurrentWindow->FontWindowScale == window->FontSize(). Text height for current window.
|
||||
float FontBaseSize; // (Shortcut) == IO.FontGlobalScale * Font->Scale * Font->FontSize. Base text height.
|
||||
float DpiScale; // Current window DpiScale
|
||||
float CurrentDpiScale; // Current window/viewport DpiScale
|
||||
ImDrawListSharedData DrawListSharedData;
|
||||
double Time;
|
||||
int FrameCount;
|
||||
|
|
@ -2269,7 +2269,7 @@ struct ImGuiContext
|
|||
Initialized = false;
|
||||
FontAtlasOwnedByContext = shared_font_atlas ? false : true;
|
||||
Font = NULL;
|
||||
FontSize = FontBaseSize = DpiScale = 0.0f;
|
||||
FontSize = FontBaseSize = CurrentDpiScale = 0.0f;
|
||||
IO.Fonts = shared_font_atlas ? shared_font_atlas : IM_NEW(ImFontAtlas)();
|
||||
Time = 0.0f;
|
||||
FrameCount = 0;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue