ocornut
bb4d19ff7c
Merge branch 'master' - merge fix
2016-12-23 12:15:09 +01:00
ocornut
fdc70456f4
Merge branch 'master' into 2016-07-navigation
2016-12-23 12:13:52 +01:00
ocornut
db593220fc
Comments, clarified use of io.MouseDelta ( #942 )
...
(ImGuiIO structure layout changed)
2016-12-23 11:34:23 +01:00
omar
f4f0ee750f
Update README.md
2016-12-21 21:13:43 +01:00
ocornut
1396659b72
Examples: Speculative fix for OSX Makefile to make Travis happy (re #812 )
2016-12-21 20:12:43 +01:00
omar
081aec482b
Merge pull request #931 from nlguillemot/master
...
Combo, ListBox: Extra const correctness.
2016-12-21 20:06:04 +01:00
ocornut
baa2e3b451
Minor documentation tweaks
2016-12-21 18:42:52 +01:00
ocornut
d74a3349e9
Examples: DirectX9: Explicitely setting viewport to match that other examples are doing ( #937 )
2016-12-19 23:15:38 +01:00
ocornut
52308a54f8
Demo: comments
2016-12-12 11:05:41 +01:00
Nicolas Guillemot
36d78e0565
const correctness for Combo and ListBox
...
Since Combo and ListBox only read and display the list of items, they
should not modify the pointers inside the array of pointers passed in.
Adding "const" here makes it possible to call these functions with such
an array of const pointers. Previously, a cast to "const char**" was
required as a workaround, otherwise there was a compile error.
2016-12-04 12:54:31 -08:00
ocornut
55d651812d
Renaming and massaging internal Settings/Ini functions ( #923 )
2016-11-29 21:55:20 +01:00
ocornut
0b6211f907
Fixed clicking on a window's void while staying still overzealously marking .ini settings as dirty ( #923 )
2016-11-29 21:46:21 +01:00
ocornut
9235e0da46
SliderInt, SliderFloat(): Fixed edge case where style.GrabMinSize being bigger than slider width can lead to a division by zero ( #919 )
2016-11-29 21:07:26 +01:00
ocornut
ca9a918535
SliderInt(): Fixed reverse direction mode when (v_max-v_min)==-1 ( #854 ) (+ ref #919 )
2016-11-28 20:43:11 +01:00
ocornut
bbd0a37bd2
ImFileOpen: MinGW uses _wfopen() codepath to support UTF-8 filenames ( #917 )
2016-11-28 20:30:36 +01:00
ocornut
449c47c789
SliderInt, SliderFloat() interacting enforce modifying to the value to be consistent with other widget behaviors ( #919 )
2016-11-28 11:05:24 +01:00
ocornut
94c77edfa5
SliderInt, SliderFloat() Better display support for v_min==v_max range. ( #919 )
2016-11-28 11:03:48 +01:00
ocornut
37a27a8025
Merge branch 'master' into 2016-07-navigation
2016-11-27 18:35:48 +01:00
ocornut
0a483379af
Split SliderBehaviorCalcRatioFromValue() out of SliderBehavior(), fix + Not using fabsf() anymore
2016-11-27 18:34:46 +01:00
ocornut
004e863727
Split SliderBehaviorCalcRatioFromValue() out from SliderBehavior()
2016-11-27 18:32:24 +01:00
ocornut
67c6d6026a
Nav: SliderFloat() Fixed non-linear sliders in Nav branch ( #787 , #323 )
2016-11-27 18:29:38 +01:00
ocornut
3028ccc25b
Merge remote-tracking branch 'origin' into 2016-07-navigation
2016-11-27 18:25:20 +01:00
ocornut
f4cf972ea9
Merge branch 'master' into 2016-02-colorpicker
2016-11-27 18:21:14 +01:00
ocornut
219e4fb8fb
SliderInt, SliderFloat: Passing v_min==v_max disable setting value from clicking/dragging ( #919 )
2016-11-27 17:49:04 +01:00
ocornut
a868c32ed1
SliderInt, SliderFloat: Renaming
2016-11-27 17:43:32 +01:00
ocornut
61d5b46307
SliderInt, SliderFloat(): support reverse direction ( #854 )
2016-11-27 17:38:33 +01:00
ocornut
104b381023
Using _wfopen() under Windows+MSVC because fopen() doesn't support UTF-8 encoding. Wrapped as ImFileOpen(). ( #917 )
2016-11-27 16:43:36 +01:00
Geoffrey Tucker
66c4281290
Began improvements to columns API by splitting the Columns() function into BeginColumns() and EndColumns() and adding additional flags. The columns data still needs to be placed into a stack.
2016-11-13 23:58:09 -08:00
ocornut
9c6048f781
Tools: binary_to_compressed_c.cpp : comments + link to precompiled binaries
2016-11-13 21:42:40 +01:00
ocornut
3085716708
Merge branch 'Loftilus-master'
2016-11-13 17:57:57 +01:00
ocornut
127dd7c88c
Examples: Vulkan: Coding style fixes ( #910 )
2016-11-13 17:57:43 +01:00
Håvard Mathisen
a5600b6e59
Vulkan example: Proper surface format search.
2016-11-13 05:23:33 +01:00
Håvard Mathisen
b447a71cf6
Vulkan example: Fix gamma for some implementations.
2016-11-13 04:28:26 +01:00
Håvard Mathisen
08ef9819c8
Vulkan example: Fix validation layer warnings and errors and redeclare gl_PerVertex.
2016-11-13 03:00:36 +01:00
ocornut
1a0e414d3a
Fixed uninitialized variables (wouldn't have a real effect because they'd be cleared in Begin()).
2016-11-12 21:17:30 +01:00
ocornut
fdbad2708c
Ignore GCC 6 warnings ( #883 )
2016-11-12 21:04:55 +01:00
ocornut
7c2b35704d
Examples: DirectX9-10-11: Only call Windows' SetCursor(NULL) when io.MouseDrawCursor is set ( #585 , #909 )
2016-11-12 19:46:52 +01:00
ocornut
2973287fd3
Merge branch 'martty-master'
2016-11-12 17:50:25 +01:00
ocornut
55863dd274
Examples: Vulkan: Shallow stylistic changes (following #879 )
2016-11-12 17:49:59 +01:00
ocornut
0449bb98e2
Merge branch 'master' of https://github.com/martty/imgui into martty-master
2016-11-12 17:36:46 +01:00
ocornut
98e1d500d4
Support for #define-ing GImGui and IMGUI_SET_CURRENT_CONTEXT_FUNC to enable custom thread-based hackery ( #586 )
2016-11-12 17:08:31 +01:00
ocornut
e0aef0018f
Updated README
2016-11-12 16:08:26 +01:00
ocornut
a68ac96bc4
Examples: GL3: Comments about gl3w ( #880 )
2016-11-12 12:48:33 +01:00
ocornut
775ac24d45
Fixed overzealous GCC warnings ( #883 ) + partly undo 8553bab241
2016-11-12 11:14:37 +01:00
omar
89d033aba3
Merge pull request #898 from tinnnysu/master
...
Examples: SDL+OpenGL2: Update cmdline syntax in Windows compilation.
2016-11-12 11:08:51 +01:00
ocornut
379533f661
Updated stb_truetype.h, stb_rect_pack.h primarily to reduce warnings ( #883 )
2016-11-11 20:19:07 +01:00
ocornut
8553bab241
Ignoring overzealous GCC warnings ( #883 )
2016-11-11 20:17:35 +01:00
ocornut
81eefb704b
Minor const fixes for overzealous warnings ( #883 )
2016-11-11 18:40:13 +01:00
ocornut
941cf1b436
Merge branch 'master' into 2016-07-navigation
2016-11-09 15:21:36 +01:00
ocornut
ccb3db94da
Merge branch 'master' into 2016-02-colorpicker
2016-11-09 15:17:20 +01:00
