Merge branch 'master' into navigation

This commit is contained in:
omar
2017-10-15 21:28:17 +02:00
3 changed files with 18 additions and 17 deletions

View File

@ -9631,7 +9631,6 @@ bool ImGui::InputFloatN(const char* label, float* v, int components, int decimal
}
PopID();
window->DC.CurrentLineTextBaseOffset = ImMax(window->DC.CurrentLineTextBaseOffset, g.Style.FramePadding.y);
TextUnformatted(label, FindRenderedTextEnd(label));
EndGroup();
@ -9674,7 +9673,6 @@ bool ImGui::InputIntN(const char* label, int* v, int components, ImGuiInputTextF
}
PopID();
window->DC.CurrentLineTextBaseOffset = ImMax(window->DC.CurrentLineTextBaseOffset, g.Style.FramePadding.y);
TextUnformatted(label, FindRenderedTextEnd(label));
EndGroup();