omar
7cd55ce939
Merge branch 'ecraven-addimagequad'
2017-05-01 12:34:45 +02:00
omar
6517d68cdf
ImDrawList::AddImage* renamed uv_ parameters to be more consistent. Fix AddImageQuad to use IM_COL32_A_MASK ( #1009 )
2017-05-01 12:34:32 +02:00
omar
f06b20185f
Merge branch 'addimagequad' of https://github.com/ecraven/imgui into ecraven-addimagequad
2017-05-01 12:25:25 +02:00
omar
884c435fd3
Merge branch 'greggman-fix-opengl3-example'
2017-05-01 12:21:05 +02:00
omar
9fdd66330f
Examples: SDL2+GL3: Fix blend func state save/restore ( #1120 )
2017-05-01 12:20:51 +02:00
Gregg Tavares
01286f6636
Fix blend func state save/restore
...
AFAIK there's no such enum as `GL_BLEND_SRC` or `GL_BLEND_DST` in OpenGL3 and OpenGL4.
Maybe they're left over from previous versions? They don't even seem to exist in OpenGL 2.1. In fact checking they were deprecated in OpenGL 1.5 (they exist in 1.3)
2017-05-01 16:05:45 +09:00
omar
d878462866
End() avoid calling Columns() if no columns set is open, not sure what it wasn't the case.
...
Pros: Faster. Avoid early crashes StackId underflow that are meant to be more gracefully caught by CheckStacksSize() (with more explicit assert). Cons: Excercise less code.
2017-04-30 12:10:45 +02:00
omar
bbd44b4edd
Clarified asserts in CheckStacksSize() when there is a stack mismatch
2017-04-30 12:10:45 +02:00
omar
a606f2dcb5
Update README.md
2017-04-28 13:43:11 +02:00
omar
9ab9a846a1
Update README.md
2017-04-28 13:40:50 +02:00
omar
6e69923e35
Update README.md
2017-04-28 13:32:04 +02:00
omar
32390a252f
Added UnrealEngine_ImGui link
2017-04-28 10:28:52 +02:00
Peter
659b3fd259
Add ImDrawList::AddImageQuad
...
Adds a function
AddImageQuad(user_texture_id, a, b, c, d, uva, uvb, uvc, uvd, col)
that shows a texture on a full quad. This allows showing arbitrary
rotations of a texture.
2017-04-28 10:04:20 +02:00
omar
104936ab1a
imconfig: Added comment about redefining ImDrawIdx
2017-04-26 19:12:46 +02:00
omar
f030087f8e
Comments to redirect people to OpenGL3 examples ( #1116 )
2017-04-26 18:27:10 +02:00
omar
50b4b29beb
Examples: GLFW+GL3, SDL+GL3: Fixed modifying bound Texture0 ( #1087 , #1088 , #1116 )
2017-04-26 18:16:59 +02:00
omar
670775ac22
Added assert/comment about using MergeMode ( #1100 )
2017-04-13 20:01:24 +02:00
omar
15d7f20d4f
Update README.md
2017-04-01 18:44:34 +02:00
omar
0e1950f7d6
Comments about child menu positioning ( #1086 )
2017-04-01 18:01:47 +02:00
omar
4b125e7d5c
Merge pull request #1078 from nem0/master
...
Added missing IMGUI_API macros in ImGuiTextEditCallbackData methods.
2017-03-29 14:51:26 +02:00
Mikulas Florek
7a37a1c3f6
do not export inline function, it causes problems on some compiers
2017-03-24 12:45:09 +01:00
Mikulas Florek
316555f9de
missing API
2017-03-24 10:10:22 +01:00
omar
e10ceebd36
ImFont: Store the texture surface used to get an idea of how costly each font is.
2017-03-17 21:29:57 +01:00
omar
b84eac53d8
ImFont: Reorder field initialization to match declaration order
2017-03-17 21:29:28 +01:00
omar
931bc61345
Comment about ImGuiInputTextFlags_CtrlEnterForNewLine for InputTextMultiline()
2017-03-16 21:55:36 +01:00
omar
9a068ce005
Merge pull request #1068 from codecat/fix-colorbutton
...
ColorButton: fix showing wrong hex value for alpha in tooltip.
2017-03-16 09:51:04 +01:00
Codecat
fdd11658eb
Fix ColorButton showing wrong hex value for alpha
2017-03-15 21:25:29 +01:00
omar
6384eee34f
Minor comments ( #998 )
2017-01-29 16:53:01 +01:00
omar
4653197ca4
Update README, kinder
2017-01-28 23:26:25 +01:00
omar
a7cf369e71
Update README.md
2017-01-28 23:14:35 +01:00
omar
8e8117c7b1
stb_truetype update (with OpenType, Type 2 font handling) ( #976 )
2017-01-21 19:23:47 +01:00
omar
b8043d3ee5
Internal: Renamed ImLoadFileToMemory to ImFileLoadToMemory to be consistent with ImFileOpen + fix mismatching .h name ( #917 )
2017-01-14 13:47:16 +01:00
omar
6257b5814a
Added an explicit (internal) ClearActiveID() helper and removed the default NULL window parameter to internal SetActiveID(),
2017-01-11 20:56:55 +01:00
omar
cffdbfe01b
Comments ( #972 )
2017-01-10 10:36:07 +01:00
omar
714beb217c
Demo: Console: Fixed a completion bug when multiple candidates are equals and match until the end.
2017-01-07 20:18:45 +01:00
ocornut
68df09cf47
Fixed word-wrapping which would never wrap after a 1 character word. (thanks @sronsse)
2017-01-01 20:11:40 +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
