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

Merge branch 'master' into docking

Browse source 
# Conflicts:
#	docs/CHANGELOG.txt
This commit is contained in:
omar 2019-06-18 23:08:03 +02:00
commit e2c1f0a7cd
27 changed files with 556 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

1
examples/example_marmalade/main.cpp
View file

@ -45,6 +45,7 @@ int main(int, char**)
//ImFont* font = io.Fonts->AddFontFromFileTTF("c:\\Windows\\Fonts\\ArialUni.ttf", 18.0f, NULL, io.Fonts->GetGlyphRangesJapanese());
//IM_ASSERT(font != NULL);
// Our state
bool show_demo_window = true;
bool show_another_window = false;
ImVec4 clear_color = ImVec4(0.45f, 0.55f, 0.60f, 1.00f);