ocornut
|
baabe3b62c
|
Merge branch 'master' into 2016-02-colorpicker
|
2016-03-23 10:50:37 +01:00 |
|
ocornut
|
367c53967f
|
Metrics: inspect individual triangles in drawcall
|
2016-03-22 21:17:24 +01:00 |
|
ocornut
|
5bed7144fe
|
ImDrawList: Added AddTriangle() function
|
2016-03-22 20:10:06 +01:00 |
|
ocornut
|
9260d46c2c
|
Comments
|
2016-03-21 22:51:51 +01:00 |
|
ocornut
|
b495a52fc0
|
ImDrawList: Allow AddText(ImFont* font, float font_size, ...) to take NULL/0.0f as default
|
2016-03-21 22:43:53 +01:00 |
|
ocornut
|
37d50dccf9
|
Added GetFontTexUvWhitePixel() helper.
|
2016-03-21 22:30:32 +01:00 |
|
ocornut
|
a274a09955
|
Renamed GetWindowFont()->GetFont(), GetWindowFontSize()->GetFontSize() (related to #340)
|
2016-03-21 22:29:11 +01:00 |
|
ocornut
|
928832a5bc
|
Various tidying up / comments, moved columns functions declarations, no functional changes
|
2016-03-21 22:11:43 +01:00 |
|
ocornut
|
9cbc6e196b
|
ImDrawList: AddRect() added optional thickness parameter + updated demo
|
2016-03-21 21:56:23 +01:00 |
|
ocornut
|
86fb3a6a3c
|
ImDrawList: AddCircle() takes optional thickness parameter
|
2016-03-21 21:48:05 +01:00 |
|
omar
|
8e8e59a942
|
Merge pull request #555 from DMartinek/patch-1
CheckboxFlags: Added support for passing/testing multiple flags at the same time.
|
2016-03-21 13:09:55 -07:00 |
|
ocornut
|
1bd3942b8e
|
Merge branch 'kylawl-master'
|
2016-03-21 13:02:33 -07:00 |
|
ocornut
|
feba83cfcd
|
Merge branch 'master' of https://github.com/kylawl/imgui into kylawl-master
|
2016-03-21 13:02:25 -07:00 |
|
ocornut
|
a9e303e006
|
Minor comments
|
2016-03-21 12:56:56 -07:00 |
|
Kyle Rocha
|
b8fcb4e7e4
|
Converted tabs to spaces
|
2016-03-21 12:40:02 -07:00 |
|
Kyle Rocha
|
3f46d9b933
|
Renamed FindTextDisplayEnd to FindRenderedTextEnd
|
2016-03-21 12:33:48 -07:00 |
|
Kyle Rocha
|
5bffc85ba6
|
Exposed FindTextDisplayEnd to imgui_internal.h
|
2016-03-21 12:07:13 -07:00 |
|
Daniel Martinek
|
37716184b3
|
Fixed coding style.
|
2016-03-18 16:49:19 +01:00 |
|
Daniel Martinek
|
5abb39cb1f
|
Added support for CheckboxFlags that can set multiple flags at the same time.
|
2016-03-18 14:02:14 +01:00 |
|
ocornut
|
4b7edffe8a
|
Comments
|
2016-03-08 20:54:21 +01:00 |
|
ocornut
|
9ea093ddd0
|
DragFloat(): always apply value when mouse is held/widget active, so that can use a drag over an always-reseting value
|
2016-03-07 13:12:15 +01:00 |
|
ocornut
|
1dcb9c877d
|
Examples: OpenGL: Fix early return on zero-sized framebuffer breaking GL state (#486, #547)
|
2016-03-06 10:46:57 +01:00 |
|
ocornut
|
6346690962
|
Comment (#544)
|
2016-03-04 14:09:08 +01:00 |
|
ocornut
|
459af7683c
|
Merge branch 'master' into 2016-02-colorpicker
|
2016-03-04 13:57:33 +01:00 |
|
ocornut
|
3db40903ba
|
InputText() ImGuiInputTextFlags_CallbackAlways event set the EventFlag field of ImGuiTextEditCallbackData (#541)
|
2016-03-04 13:07:42 +01:00 |
|
ocornut
|
2065cbec4d
|
Removed extraneous comma for pedantic compilers (#516)
|
2016-03-03 00:34:06 +01:00 |
|
ocornut
|
76ce08c338
|
Merge branch 'zapolnov-master'
|
2016-03-03 00:30:26 +01:00 |
|
ocornut
|
b816d05e33
|
Minor tidying up following (#516) - renamed ImGuiSelectableFlags_HandleDoubleClick to ImGuiSelectableFlags_AllowDoubleClick + comments
|
2016-03-03 00:30:08 +01:00 |
|
ocornut
|
6846873f23
|
Merge branch 'master' of https://github.com/zapolnov/imgui into zapolnov-master
|
2016-03-03 00:18:58 +01:00 |
|
ocornut
|
d45044fe54
|
CaptureKeyboardFromApp() / CaptureMouseFromApp(): allow to enforce clearing the capture flag (#533) + demo + made code a little less messy
|
2016-03-03 00:09:41 +01:00 |
|
ocornut
|
cf12bc7dea
|
InputText: Added BufTextLen in ImGuiTextEditCallbackData. Requesting user to maintain it. Zero-ing structure properly before use. (#541)
|
2016-03-02 23:34:29 +01:00 |
|
ocornut
|
17d3c202ac
|
BeginChild()/EndChild() fixed incorrect layout to allow widgets submitted after an auto-fit child wnidow (#540)
|
2016-03-02 21:46:23 +01:00 |
|
ocornut
|
ba80a457b9
|
Demo: plot code doesn't use ImVector to avoid heap allocation + comment (#538)
|
2016-02-29 12:53:05 +01:00 |
|
ocornut
|
1881cbe860
|
TextUnformatted: Fixed rare crash bug with large blurb of text (2k+) not finishing with a '\n' and fully above the clipping Y line. (#535)
|
2016-02-24 22:43:17 +01:00 |
|
ocornut
|
4afe67cdc8
|
Demo: Fixed malloc/free mismatch and leak when destructing demo console (if it has been used) (#536)
|
2016-02-24 11:50:21 +01:00 |
|
ocornut
|
a43a9e602a
|
ColorEdit4: support ImGuiColorEditFlags_NoSliders to display only a button (wip #346)
|
2016-02-21 23:55:01 +01:00 |
|
ocornut
|
f8fede1d8b
|
Added ColorPicker3/ColorPicker4, refactoring ColorEdit3/ColorEdit4 adding a bunch of flags and access to picker (wip #346)
Still pretty much experimenting so may break API
|
2016-02-21 23:23:30 +01:00 |
|
ocornut
|
ab97b42935
|
Merge branch 'master' of https://github.com/ocornut/imgui
|
2016-02-21 18:10:44 +01:00 |
|
ocornut
|
d1061c8799
|
Exposed FindWindowByName() in imgui_internal.h (missing chunk following 339b67c01a )
|
2016-02-21 18:10:35 +01:00 |
|
omar
|
991d9e2884
|
Update README.md
|
2016-02-20 23:20:15 +01:00 |
|
omar
|
874df53403
|
Update README.md
|
2016-02-20 20:46:08 +01:00 |
|
ocornut
|
339b67c01a
|
Exposed FindWindowByName() in imgui_internal.h
|
2016-02-20 17:37:36 +01:00 |
|
ocornut
|
2813a44dcc
|
Examples: OpenGL: skip rendering and calling glViewport() if we have a zero-fixed buffer (#486)
|
2016-02-16 09:14:38 +01:00 |
|
ocornut
|
9e86d0e225
|
Examples: SDL/OpenGL: Tabs to spaces
|
2016-02-15 10:56:37 +01:00 |
|
ocornut
|
87a6110994
|
Examples: OpenGL3: Fix BindVertexArray/BindBuffer order (#527)
|
2016-02-15 10:55:20 +01:00 |
|
ocornut
|
20ba769644
|
Allow windows with only a callback only to be functional + minor cleanup (#524)
|
2016-02-14 10:33:56 +01:00 |
|
ocornut
|
5b7a0b1b40
|
InputText() added comment (#526)
|
2016-02-11 23:00:14 +01:00 |
|
ocornut
|
07e379a950
|
Examples: DirectX9: Wastefully use a RGBA8 texture for the font texture to make compability more evident with user's textures (#521)
|
2016-02-08 09:03:43 +01:00 |
|
ocornut
|
dafedc3246
|
Demo: use locally defined strdup because compilers/standard librairies are an annoyance (#520)
|
2016-02-08 08:44:45 +01:00 |
|
ocornut
|
2c6bc95dd5
|
Demo: InputText password demo filters out blanks (#515)
|
2016-02-03 09:24:57 +01:00 |
|