omar
|
44e8d94aba
|
Merge branch 'master' into navigation
|
7 years ago |
|
omar
|
709653c330
|
Merge branch 'master' into styles
|
7 years ago |
|
omar
|
38ed66f55e
|
Merge branch 'master' into navigation
# Conflicts:
# imgui_demo.cpp
|
7 years ago |
|
omar
|
9e2f202f05
|
Demo: Not using the undesirable Begin() overload.
|
7 years ago |
|
omar
|
5c4fda0fbc
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
7 years ago |
|
omar
|
6a1ba317c7
|
Demo: Minor coding style tweaks so bgfx copy needs less patching.
|
7 years ago |
|
omar
|
807322c9a5
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
|
7 years ago |
|
omar
|
37f3a718c6
|
Marked all fmt + va_list functions with format attribute so GCC/Clang can warn about them. Not ignoring -Wsuggest-attribute=format anymore for GCC/Clang.
|
7 years ago |
|
omar
|
40f608ce9b
|
Version 1.52 WIP
|
7 years ago |
|
omar
|
55a6209931
|
Version 1.51
|
7 years ago |
|
omar
|
82c3116b4f
|
Demo: Displaying version number in test window.
|
7 years ago |
|
omar
|
444792f75f
|
Merge fixes from ,master branch
|
7 years ago |
|
omar
|
53e73182ff
|
Merge branch 'master' into navigation
# Conflicts:
# imgui_internal.h
|
7 years ago |
|
omar
|
54bdd00df7
|
Columns: Fix for explicit content width and scrollbar. (#519, #125)
|
7 years ago |
|
omar
|
1ebd7ec049
|
Demo: Columns: Added Horizontal Scrolling demo. Tweaked another Columns demo. (#519, #125, #913)
|
7 years ago |
|
omar
|
19a42cb2fd
|
Columns: Moved BeginColumns/EndColumns/flags from #913 to imgui_internals.h + minor shallow tweaks. Removed demo code temporarily. (#125)
|
7 years ago |
|
omar
|
bc78535bbf
|
Merge branch 'master' of https://github.com/ggtucker/imgui into ggtucker-master
# Conflicts:
# imgui.cpp
# imgui.h
|
7 years ago |
|
omar
|
b4eeb4aa8d
|
Renamed GetStyleColName() to GetStyleColorName() for consistency. Extra comments in Api Breaking Changes section.
|
7 years ago |
|
omar
|
91d841dd5f
|
Added PushStyleColor(ImGuiCol idx, ImU32 col) overload. (Which _might_ cause an "ambiguous call" compilation error if you are using ImColor() with implicit cast. Cast to ImU32 or ImVec4 explicily to fix.)
|
7 years ago |
|
omar
|
bf0d9c123e
|
Merge branch 'master' into navigation
|
7 years ago |
|
omar
|
24a78767d2
|
Merge branch 'master' into styles
# Conflicts:
# TODO.txt
|
7 years ago |
|
omar
|
52f1a4124c
|
Demo: Tweaked Fonts section.
|
7 years ago |
|
omar
|
68bf5ecbc1
|
Marked the weird IMGUI_ONCE_UPON_A_FRAME helper macro as obsolete. prefer using the more explicit ImGuiOnceUponAFrame. Removed the broken __LINE__ from IMGUI_ONCE_UPON_A_FRAME
|
7 years ago |
|
omar
|
668a4bf1bc
|
Demo: style editor output tweak so it is easier to modify the output code.. + TODO list update
|
7 years ago |
|
omar
|
18b50f8eba
|
Comments
|
7 years ago |
|
omar
|
9bf5028fd3
|
Merge branch 'master' into navigation
|
7 years ago |
|
omar
|
97fccbdb73
|
Demo: Fixed conflicting id introduced in be9628494a . Added tooltip.
|
7 years ago |
|
omar
|
5eef7dd82f
|
Demo: Consoles: Added "Copy" button to demonstrate LogToClipboard
|
7 years ago |
|
omar
|
73f9c9d80c
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
|
7 years ago |
|
omar
|
7e452ec737
|
Renamed ImGuiSetCond_XXX type and enums to ImGuiCond_XXX, kept old enums under #ifdef IMGUI_DISABLE_OBSOLETE_FUNCTIONS
|
7 years ago |
|
omar
|
059e838b2c
|
Merge branch 'master' into navigation
|
7 years ago |
|
omar
|
be9628494a
|
Demo: Rearranged everything under Widgets in a more consistent way.
|
7 years ago |
|
omar
|
d888de4483
|
Demo: Merged a few demo tweaks from navigation branch to minimize drift.
|
7 years ago |
|
omar
|
30d1e5712a
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_internal.h
|
7 years ago |
|
omar
|
942cb0e1f2
|
Added SetColorEditOptions(). ColorPicker4: context menu to select picker type and alpha bar. Reorganized flags (again!). (#346)
|
7 years ago |
|
omar
|
d952a8d3bf
|
Demo: Color widget demo tweaks (#346)
|
7 years ago |
|
omar
|
03700ad15e
|
Merge remote-tracking branch 'origin' into 2016-07-navigation
|
7 years ago |
|
omar
|
1c991b525a
|
Merge remote-tracking branch 'origin' into 2016-02-colorpicker
|
7 years ago |
|
omar
|
e36b41cbd0
|
Fixed Y scroll aiming when Horizontal Scrollbar is enabled (#665). Tweak log demo.
|
7 years ago |
|
omar
|
233a6efeba
|
Fixed GetScrollMaxX(), GetScrollMaxY(). Tweak demo to display more data. Using functions in Begin(). (#1271)
|
7 years ago |
|
omar
|
cdea8ca94f
|
Demo: Comment about 'static' and some tweaks (#1267)
|
7 years ago |
|
omar
|
f6460970c5
|
ColorPicker: Hue wheel + SV triangle picker mode (mode selection flags still wip, missing context menu and persistent options). (#346)
|
7 years ago |
|
omar
|
3075d8bcd4
|
ColorEdit4: Preliminary support for ImGuiColorEditFlags_HDR flag (currently only lift limits). (#346)
|
7 years ago |
|
omar
|
91a4f5df25
|
Demo: Tweaks
|
7 years ago |
|
omar
|
90fcd4a829
|
Renamed ImGuiColorEditFlags_NoColorSquare to ImGuiColorEditFlags_NoSmallPreview (#346)
|
7 years ago |
|
omar
|
4d844ffde1
|
Demo: custom ColorPicker popup example tweaks (#346)
|
7 years ago |
|
omar
|
f040547a5f
|
Demo: custom ColorPicker popup example (#346)
|
7 years ago |
|
omar
|
fef8aac523
|
ColorPicker4: hue/alpha bars draw arrows that would look right on all background. RenderArrow helper. (#346)
|
7 years ago |
|
omar
|
35186a1165
|
Demo: Comments (#346)
|
7 years ago |
|
omar
|
3926bd08e1
|
ColorPicker: Added ImGuiColorEditFlags_NoSidePreview flag + optional reference color. Added more demo code. (#346)
|
7 years ago |