ocornut
77177c18f0
Merge branch 'master' into 2016-02-colorpicker
2016-04-09 19:12:03 +02:00
ocornut
1588eda1ac
Version 1.49 WIP
2016-04-09 19:10:42 +02:00
ocornut
95cbcdca3f
Version 1.48
2016-04-09 17:46:48 +02:00
ocornut
4c25de950c
Warning fixes for clang. Using int64_t, may be an issue?
2016-04-09 17:46:38 +02:00
ocornut
31852e1d05
Silence borderline warning with -Werror=strict-overflow
...
Error: assuming signed overflow does not occur when assuming that (X -
c) > X is always false [-Werror=strict-overflow]
2016-04-06 11:11:38 +02:00
omar
319e288eef
Update README.md
2016-04-05 23:08:21 +02:00
ocornut
71b981d05f
Examples: Apple: Readme tweaks ( #575 #247 )
2016-04-05 22:50:23 +02:00
omar
b359ed7b3e
Remove local glfw3 lib for osx. (+1 squashed commit)
...
Examples: Added OS X example (moved from ios, added support for os x)
2016-04-05 22:43:36 +02:00
James Chen
67b604412b
Remove local glfw3 lib for osx. (+1 squashed commit)
...
Squashed commits:
[34cc3b7] Adds osx example. (+6 squashed commits)
Squashed commits:
[20330f2] Uses glfw by brew install.
[0427861] Renames imguiex folder name to imguiex-ios
[f9e27e5] Renames ios_example to apple_example.
[44f8fe3] Updates the glfw header/library path.
[919f279] Renames target from imguiex to imguiex-ios since there is already a imguiex-osx target now.
[24395f5] Adds osx example.
2016-04-05 18:13:48 +08:00
cheriff
2ee76bbff6
Trivial format string fix in demo
2016-04-05 09:23:00 +02:00
ocornut
e808b7cfca
Style: removed WindowFillAlphaDefault which was confusing and redundant, baked into WindowBg color. Renamed TooltipBg > PopupBG. ( #337 )
...
bg_alpha parameter of 5-parameters version of Begin() is an override,
however that function may become obsolete someday.
2016-04-04 01:37:02 +02:00
ocornut
947171dcef
Fixed InputTextMultiLine(), ListBox(), BeginChildFrame(): outer frame not honoring bordering (following #462 )
2016-04-04 00:30:50 +02:00
ocornut
07df3cfb3e
Added ImGuiWindowFlags_AlwaysUseWindowPadding flag to ensure non-border child window uses window padding ( #462 )
2016-04-04 00:29:57 +02:00
ocornut
8e353af1d3
Renamed ImGuiWindowFlags_Force**Scrollbar to ImGuiWindowFlags_Always**Scrollbar ( #476 )
2016-04-03 23:28:05 +02:00
ocornut
26be1511e9
Merge branch 'Loftilus-master'
2016-04-03 17:43:40 +02:00
ocornut
c1427de5b6
Examples: Libs: Update glfw binaries to glfw master.
2016-04-03 17:41:59 +02:00
ocornut
0e7b9b8284
Examples: Vulkan: Coding style tweaks.
2016-04-03 17:32:53 +02:00
ocornut
9c513d4443
Merge branch 'master' of https://github.com/Loftilus/imgui into Loftilus-master
2016-04-03 16:42:56 +02:00
ocornut
f45fd1cef6
Comments
2016-04-03 16:42:35 +02:00
ocornut
552246feed
Examples: DirectX10,DirectX11 : Minor renaming
2016-04-03 13:02:04 +02:00
ocornut
518f32ccfe
Examples: DirectX10: Save/restore state + minor cleanups ( #570 )
2016-04-03 12:59:56 +02:00
ocornut
90493f8add
Examples: DirectX11: Shallow massaging to make the code more consistent/readable (following #570 )
2016-04-03 12:48:38 +02:00
ocornut
726b91a2cd
Merge branch 'nlguillemot-patch-1'
2016-04-03 12:43:43 +02:00
ocornut
2942240072
Examples: DX11: Cleanup state backup/restore code ( #570 )
2016-04-03 12:43:17 +02:00
Nicolas Guillemot
d4d51a7802
capture and restore all state
2016-04-02 19:08:27 -07:00
ocornut
4c1d4233b2
Merge branch 'master' into 2016-02-colorpicker
2016-04-03 01:10:26 +02:00
ocornut
650515ce49
Updated todo list and comments
2016-04-03 01:07:11 +02:00
ocornut
d53c308852
Moved EndFrame() back to imgui_internal.h + comments. Undo cfbf06e394
2016-04-03 00:47:41 +02:00
ocornut
1eacfd120b
Update README.md
2016-04-03 00:26:00 +02:00
ocornut
c61e08e8c4
InputText: move to next word OS X style behavior on OS X ( #473 )
2016-04-02 22:06:47 +02:00
ocornut
aeaf5ccebb
stb_textedit.h: proposal for upstream PR to allow custom move-left/move-right handlers (following #473 )
2016-04-02 21:20:41 +02:00
ocornut
9945eecaf4
stb_truetype: updated 1.08 > 1.10 + minor unused variable warning fix
2016-04-02 20:12:20 +02:00
ocornut
c3376cd45c
stb_textedit.h Local warning fixes
2016-04-02 20:08:42 +02:00
ocornut
e7b95646b9
stb_textedit.h updated to 1.8 (our two main changes were merged now)
2016-04-02 20:08:11 +02:00
ocornut
f48fc51777
IO: Added unused MultiSelectUsesSuperKey dummy field to convey semantic for OS X compatible behavior ( #473 )
2016-04-02 18:58:42 +02:00
ocornut
aa7a29cdbf
InputText(): Added io.DoubleClickSelectsWord option for OS X compatible behavior ( #473 )
2016-04-02 18:57:50 +02:00
ocornut
587fc60f25
InputText/IO: Added WordMovementUsesAltKey , ShortcutsUseSuperKey for OS X Compatible behavior ( #473 )
2016-04-02 18:57:08 +02:00
ocornut
a6399f120f
IO: Added "Super" keyboard modifiers (corresponding to Cmd on Mac and Windows key in theory although the later is hard to read) ( #473 )
...
NB: Value not used.
2016-04-02 18:22:40 +02:00
omar
171b0e5ca9
Update README.md
2016-03-30 16:30:17 +02:00
ocornut
ae0c33c983
Examples: Links
2016-03-29 11:33:23 +02:00
ocornut
9e817a7c38
ColorPicker3/4: Fixed missing ID scoping ( #346 )
2016-03-28 23:45:23 +02:00
ocornut
6a241d4895
ColorPicker3: Fixed
2016-03-28 23:38:04 +02:00
ocornut
326c4e40f8
Merge branch 'master' into 2016-02-colorpicker
2016-03-28 23:17:13 +02:00
omar
41c5d4651b
Update README.md
2016-03-27 12:04:17 +02:00
omar
c4876078b4
Update README.md
2016-03-27 11:43:12 +02:00
ocornut
cfbf06e394
Comments and moved EndFrame() for imgui_internal.h (for clarity? or extra confusion?)
2016-03-27 10:38:14 +02:00
omar
39c9bb73e8
Merge pull request #563 from mneumann/fix_dragonfly
...
Fix compilation on DragonFly BSD
2016-03-26 16:40:00 +01:00
ocornut
7661b1e778
Trim trailing spaces
2016-03-26 15:43:45 +01:00
ocornut
2b7eeba143
Trim trailing spaces
2016-03-26 15:38:52 +01:00
ocornut
d6750c87c2
Combo: display popup above if there's isn't enough space below / or select largest side ( #505 )
2016-03-25 23:36:43 +01:00
