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 |
|
ocornut
|
7c9fa59329
|
Combo: Right-most button stays highlight when popup is open.
|
2016-03-25 22:55:45 +01:00 |
|
ocornut
|
c71aae08f3
|
Merge branch 'brushfiregames-master'
|
2016-03-25 22:28:19 +01:00 |
|
ocornut
|
fdc4299c6c
|
Examples: SDL: Made ImGui_ImplSdlGL3_NewFrame() signature match GL2 one
|
2016-03-25 22:27:43 +01:00 |
|
ocornut
|
e6c2c1fcfd
|
Examples: SDL: Minor fixes to follow syntax of other examples (#495)
|
2016-03-25 22:25:20 +01:00 |
|
Nick Gravelyn
|
8a61c0afea
|
Applying same fix to OpenGL 3 example. Fixing spaces/tabs.
|
2016-03-25 22:20:57 +01:00 |
|
Nick Gravelyn
|
a9b0abe493
|
Automatically updating DisplayFrameBufferScale by reading the OpenGL drawable size and comparing with the window size. This fixed dear imgui which was rendering only to 1/4 of my window.
|
2016-03-25 22:19:07 +01:00 |
|
ocornut
|
aecf5d12e6
|
DragFloat(), SliderFloat(), InputFloat(): fixed cases of erroneously returning true repeatedly after a text input modification (#564)
|
2016-03-25 21:53:59 +01:00 |
|
Michael Neumann
|
adb4d4d48b
|
Fix compilation on DragonFly BSD
|
2016-03-24 19:37:11 +01:00 |
|
ocornut
|
5b8aa0dc84
|
FAQ and comments about the use of ImTextureID (#562, #561, #521, #510, #497, #475)
|
2016-03-24 11:06:57 +01:00 |
|
ocornut
|
04396ed7a9
|
FAQ and comments about the use of ImTextureID (#562, #561, #521, #510, #497, #475 ...)
|
2016-03-24 11:00:47 +01:00 |
|
ocornut
|
d39029f3a8
|
Branch fix
|
2016-03-23 10:51:40 +01:00 |
|
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 |
|
Håvard Mathisen
|
1394616d9c
|
Vulkan Example: Some code layout changes.
|
2016-03-10 12:30:38 +01:00 |
|
Håvard Mathisen
|
4ea4fa3e73
|
Vulkan Example: Fix synchronization.
|
2016-03-10 11:59:42 +01:00 |
|
Håvard Mathisen
|
0ceddc29ff
|
Vulkan Example: Fix windows build.
|
2016-03-09 17:01:38 +01:00 |
|
Håvard Mathisen
|
4cbd316f01
|
Vulkan example.
|
2016-03-09 16:39:54 +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 |
|