mirror/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2026-01-13 00:24:20 +00:00
Code Activity

Merge branch 'master' into viewport

Browse source 
# Conflicts:
#	imgui.cpp
This commit is contained in:
omar 2018-09-06 15:59:35 +02:00
commit b974fffea0
11 changed files with 24 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
imgui_widgets.cpp
View file

@ -1,4 +1,4 @@
// dear imgui, v1.65 WIP
// dear imgui, v1.65
// (widgets code)
/*
@ -2958,7 +2958,7 @@ static bool STB_TEXTEDIT_INSERTCHARS(STB_TEXTEDIT_STRING* obj, int pos, const Im
#define STB_TEXTEDIT_K_SHIFT 0x20000
#define STB_TEXTEDIT_IMPLEMENTATION
#include "stb_textedit.h"
#include "imstb_textedit.h"
}