Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2025-07-04 12:08:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into navigation

Browse Source 
# Conflicts:
#	imgui.cpp
This commit is contained in:
omar
2018-01-31 15:43:19 +01:00
parent bd579e5429 dd41a1650a
commit 23c11e9764
17 changed files with 287 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
imgui_demo.cpp
View File

@ -94,7 +94,7 @@ static void ShowHelpMarker(const char* desc)
if (ImGui::IsItemHovered())
{
ImGui::BeginTooltip();
ImGui::PushTextWrapPos(450.0f);
ImGui::PushTextWrapPos(ImGui::GetFontSize() * 35.0f);
ImGui::TextUnformatted(desc);
ImGui::PopTextWrapPos();
ImGui::EndTooltip();
@ -2002,7 +2002,7 @@ void ImGui::ShowDemoWindow(bool* p_open)
// Here we use the simplified Combo() api that packs items into a single literal string. Useful for quick combo boxes where the choices are known locally.
bool ImGui::ShowStyleSelector(const char* label)
{
static int style_idx = 0;
static int style_idx = -1;
if (ImGui::Combo(label, &style_idx, "Classic\0Dark\0Light\0"))
{
switch (style_idx)