Commit Graph

  • 2ee76bbff6 Trivial format string fix in demo cheriff 2016-04-05 17:23:00 +1000
  • b60d0306db Fix format sting in demo: display KeySuper status (and clear a Clang warning) David Mirabito 2016-04-05 11:27:45 +1000
  • e808b7cfca Style: removed WindowFillAlphaDefault which was confusing and redundant, baked into WindowBg color. Renamed TooltipBg > PopupBG. (#337) ocornut 2016-04-04 01:37:02 +0200
  • 947171dcef Fixed InputTextMultiLine(), ListBox(), BeginChildFrame(): outer frame not honoring bordering (following #462) ocornut 2016-04-04 00:30:50 +0200
  • 07df3cfb3e Added ImGuiWindowFlags_AlwaysUseWindowPadding flag to ensure non-border child window uses window padding (#462) ocornut 2016-04-04 00:29:57 +0200
  • 8e353af1d3 Renamed ImGuiWindowFlags_Force**Scrollbar to ImGuiWindowFlags_Always**Scrollbar (#476) ocornut 2016-04-03 23:28:05 +0200
  • 26be1511e9 Merge branch 'Loftilus-master' ocornut 2016-04-03 17:43:40 +0200
  • c1427de5b6 Examples: Libs: Update glfw binaries to glfw master. ocornut 2016-04-03 17:41:59 +0200
  • 0e7b9b8284 Examples: Vulkan: Coding style tweaks. ocornut 2016-04-03 17:32:53 +0200
  • 9c513d4443 Merge branch 'master' of https://github.com/Loftilus/imgui into Loftilus-master ocornut 2016-04-03 16:42:56 +0200
  • f45fd1cef6 Comments ocornut 2016-04-03 16:42:35 +0200
  • 552246feed Examples: DirectX10,DirectX11 : Minor renaming ocornut 2016-04-03 13:02:04 +0200
  • 518f32ccfe Examples: DirectX10: Save/restore state + minor cleanups (#570) ocornut 2016-04-03 12:59:56 +0200
  • 90493f8add Examples: DirectX11: Shallow massaging to make the code more consistent/readable (following #570) ocornut 2016-04-03 12:48:38 +0200
  • 726b91a2cd Merge branch 'nlguillemot-patch-1' ocornut 2016-04-03 12:43:43 +0200
  • 2942240072 Examples: DX11: Cleanup state backup/restore code (#570) ocornut 2016-04-03 12:43:17 +0200
  • d4d51a7802 capture and restore all state Nicolas Guillemot 2016-04-02 19:08:27 -0700
  • 4c1d4233b2 Merge branch 'master' into 2016-02-colorpicker ocornut 2016-04-03 01:10:26 +0200
  • 650515ce49 Updated todo list and comments ocornut 2016-04-03 01:07:11 +0200
  • d53c308852 Moved EndFrame() back to imgui_internal.h + comments. Undo cfbf06e394 ocornut 2016-04-03 00:47:41 +0200
  • 1eacfd120b Update README.md ocornut 2016-04-03 00:26:00 +0200
  • c61e08e8c4 InputText: move to next word OS X style behavior on OS X (#473) ocornut 2016-04-02 22:06:47 +0200
  • aeaf5ccebb stb_textedit.h: proposal for upstream PR to allow custom move-left/move-right handlers (following #473) ocornut 2016-04-02 21:20:41 +0200
  • 9945eecaf4 stb_truetype: updated 1.08 > 1.10 + minor unused variable warning fix ocornut 2016-04-02 20:12:20 +0200
  • c3376cd45c stb_textedit.h Local warning fixes ocornut 2016-04-02 20:08:42 +0200
  • e7b95646b9 stb_textedit.h updated to 1.8 (our two main changes were merged now) ocornut 2016-04-02 20:08:11 +0200
  • f48fc51777 IO: Added unused MultiSelectUsesSuperKey dummy field to convey semantic for OS X compatible behavior (#473) ocornut 2016-04-02 18:58:42 +0200
  • aa7a29cdbf InputText(): Added io.DoubleClickSelectsWord option for OS X compatible behavior (#473) ocornut 2016-04-02 18:57:50 +0200
  • 587fc60f25 InputText/IO: Added WordMovementUsesAltKey , ShortcutsUseSuperKey for OS X Compatible behavior (#473) ocornut 2016-04-02 18:57:08 +0200
  • a6399f120f IO: Added "Super" keyboard modifiers (corresponding to Cmd on Mac and Windows key in theory although the later is hard to read) (#473) ocornut 2016-04-02 18:22:40 +0200
  • 171b0e5ca9 Update README.md omar 2016-03-30 16:30:17 +0200
  • ae0c33c983 Examples: Links ocornut 2016-03-29 11:33:23 +0200
  • 9e817a7c38 ColorPicker3/4: Fixed missing ID scoping (#346) ocornut 2016-03-28 23:45:23 +0200
  • 6a241d4895 ColorPicker3: Fixed ocornut 2016-03-28 23:38:04 +0200
  • 326c4e40f8 Merge branch 'master' into 2016-02-colorpicker ocornut 2016-03-28 23:17:13 +0200
  • 41c5d4651b Update README.md omar 2016-03-27 12:04:17 +0200
  • c4876078b4 Update README.md omar 2016-03-27 11:43:12 +0200
  • cfbf06e394 Comments and moved EndFrame() for imgui_internal.h (for clarity? or extra confusion?) ocornut 2016-03-27 10:38:14 +0200
  • 39c9bb73e8 Merge pull request #563 from mneumann/fix_dragonfly omar 2016-03-26 16:40:00 +0100
  • 7661b1e778 Trim trailing spaces ocornut 2016-03-26 15:43:45 +0100
  • 2b7eeba143 Trim trailing spaces ocornut 2016-03-26 15:38:52 +0100
  • d6750c87c2 Combo: display popup above if there's isn't enough space below / or select largest side (#505) ocornut 2016-03-25 23:36:43 +0100
  • 7c9fa59329 Combo: Right-most button stays highlight when popup is open. ocornut 2016-03-25 22:55:45 +0100
  • c71aae08f3 Merge branch 'brushfiregames-master' ocornut 2016-03-25 22:28:19 +0100
  • fdc4299c6c Examples: SDL: Made ImGui_ImplSdlGL3_NewFrame() signature match GL2 one ocornut 2016-03-25 22:27:43 +0100
  • e6c2c1fcfd Examples: SDL: Minor fixes to follow syntax of other examples (#495) ocornut 2016-03-25 22:25:20 +0100
  • 8a61c0afea Applying same fix to OpenGL 3 example. Fixing spaces/tabs. Nick Gravelyn 2016-01-20 06:11:28 -0800
  • 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. Nick Gravelyn 2016-01-20 06:06:31 -0800
  • aecf5d12e6 DragFloat(), SliderFloat(), InputFloat(): fixed cases of erroneously returning true repeatedly after a text input modification (#564) ocornut 2016-03-25 21:53:59 +0100
  • adb4d4d48b Fix compilation on DragonFly BSD Michael Neumann 2016-03-24 19:37:11 +0100
  • 5b8aa0dc84 FAQ and comments about the use of ImTextureID (#562, #561, #521, #510, #497, #475) ocornut 2016-03-24 11:06:57 +0100
  • 04396ed7a9 FAQ and comments about the use of ImTextureID (#562, #561, #521, #510, #497, #475 ...) ocornut 2016-03-24 11:00:47 +0100
  • d39029f3a8 Branch fix ocornut 2016-03-23 10:51:40 +0100
  • baabe3b62c Merge branch 'master' into 2016-02-colorpicker ocornut 2016-03-23 10:50:37 +0100
  • 367c53967f Metrics: inspect individual triangles in drawcall ocornut 2016-03-22 21:17:24 +0100
  • 5bed7144fe ImDrawList: Added AddTriangle() function ocornut 2016-03-22 20:10:06 +0100
  • 9260d46c2c Comments ocornut 2016-03-21 22:51:51 +0100
  • b495a52fc0 ImDrawList: Allow AddText(ImFont* font, float font_size, ...) to take NULL/0.0f as default ocornut 2016-03-21 22:43:53 +0100
  • 37d50dccf9 Added GetFontTexUvWhitePixel() helper. ocornut 2016-03-21 22:30:32 +0100
  • a274a09955 Renamed GetWindowFont()->GetFont(), GetWindowFontSize()->GetFontSize() (related to #340) ocornut 2016-03-21 22:29:11 +0100
  • 928832a5bc Various tidying up / comments, moved columns functions declarations, no functional changes ocornut 2016-03-21 22:11:43 +0100
  • 9cbc6e196b ImDrawList: AddRect() added optional thickness parameter + updated demo ocornut 2016-03-21 21:56:23 +0100
  • 86fb3a6a3c ImDrawList: AddCircle() takes optional thickness parameter ocornut 2016-03-21 21:48:05 +0100
  • 8e8e59a942 Merge pull request #555 from DMartinek/patch-1 omar 2016-03-21 13:09:55 -0700
  • 1bd3942b8e Merge branch 'kylawl-master' ocornut 2016-03-21 13:02:33 -0700
  • feba83cfcd Merge branch 'master' of https://github.com/kylawl/imgui into kylawl-master ocornut 2016-03-21 13:02:25 -0700
  • a9e303e006 Minor comments ocornut 2016-03-21 12:56:56 -0700
  • b8fcb4e7e4 Converted tabs to spaces Kyle Rocha 2016-03-21 12:40:02 -0700
  • 3f46d9b933 Renamed FindTextDisplayEnd to FindRenderedTextEnd Kyle Rocha 2016-03-21 12:33:48 -0700
  • 5bffc85ba6 Exposed FindTextDisplayEnd to imgui_internal.h Kyle Rocha 2016-03-21 12:07:13 -0700
  • 37716184b3 Fixed coding style. Daniel Martinek 2016-03-18 16:49:19 +0100
  • 5abb39cb1f Added support for CheckboxFlags that can set multiple flags at the same time. Daniel Martinek 2016-03-18 14:02:14 +0100
  • 23c517b41f Merge 459af7683c into 4b7edffe8a yixiaoqingyuz 2016-03-15 05:57:38 +0000
  • bf947c65d6 Merge branch 'master' of https://github.com/ocornut/imgui Pacôme Danhiez 2016-03-13 19:01:41 +0100
  • 1394616d9c Vulkan Example: Some code layout changes. Håvard Mathisen 2016-03-10 12:30:38 +0100
  • 4ea4fa3e73 Vulkan Example: Fix synchronization. Håvard Mathisen 2016-03-10 11:59:42 +0100
  • 0ceddc29ff Vulkan Example: Fix windows build. Håvard Mathisen 2016-03-09 17:01:38 +0100
  • 4cbd316f01 Vulkan example. Håvard Mathisen 2016-03-09 16:39:54 +0100
  • 4b7edffe8a Comments ocornut 2016-03-08 20:54:21 +0100
  • 9ea093ddd0 DragFloat(): always apply value when mouse is held/widget active, so that can use a drag over an always-reseting value ocornut 2016-03-07 13:12:15 +0100
  • 1dcb9c877d Examples: OpenGL: Fix early return on zero-sized framebuffer breaking GL state (#486, #547) ocornut 2016-03-06 10:46:57 +0100
  • 6346690962 Comment (#544) ocornut 2016-03-04 14:09:08 +0100
  • 459af7683c Merge branch 'master' into 2016-02-colorpicker ocornut 2016-03-04 13:57:33 +0100
  • 3db40903ba InputText() ImGuiInputTextFlags_CallbackAlways event set the EventFlag field of ImGuiTextEditCallbackData (#541) ocornut 2016-03-04 13:07:42 +0100
  • 2065cbec4d Removed extraneous comma for pedantic compilers (#516) ocornut 2016-03-03 00:34:06 +0100
  • 76ce08c338 Merge branch 'zapolnov-master' ocornut 2016-03-03 00:30:26 +0100
  • b816d05e33 Minor tidying up following (#516) - renamed ImGuiSelectableFlags_HandleDoubleClick to ImGuiSelectableFlags_AllowDoubleClick + comments ocornut 2016-03-03 00:30:08 +0100
  • 6846873f23 Merge branch 'master' of https://github.com/zapolnov/imgui into zapolnov-master ocornut 2016-03-03 00:18:58 +0100
  • d45044fe54 CaptureKeyboardFromApp() / CaptureMouseFromApp(): allow to enforce clearing the capture flag (#533) + demo + made code a little less messy ocornut 2016-03-03 00:09:41 +0100
  • cf12bc7dea InputText: Added BufTextLen in ImGuiTextEditCallbackData. Requesting user to maintain it. Zero-ing structure properly before use. (#541) ocornut 2016-03-02 23:34:29 +0100
  • 17d3c202ac BeginChild()/EndChild() fixed incorrect layout to allow widgets submitted after an auto-fit child wnidow (#540) ocornut 2016-03-02 21:46:23 +0100
  • ba80a457b9 Demo: plot code doesn't use ImVector to avoid heap allocation + comment (#538) ocornut 2016-02-29 12:53:05 +0100
  • 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) ocornut 2016-02-24 22:43:17 +0100
  • 4afe67cdc8 Demo: Fixed malloc/free mismatch and leak when destructing demo console (if it has been used) (#536) ocornut 2016-02-24 11:50:21 +0100
  • 9274c85b38 Merge ae128cf2c8 into ab97b42935 Danny Angelo Carminati Grein 2016-02-24 04:14:32 +0000
  • ae128cf2c8 Fixes free mismatch in the demo for history and log items. Danny Angelo Carminati Grein 2016-02-23 23:06:37 -0500
  • f6181b3428 Examples: DirectX12: Add directx12_example Jefferson Montgomery 2016-02-22 15:22:48 -0800
  • a43a9e602a ColorEdit4: support ImGuiColorEditFlags_NoSliders to display only a button (wip #346) ocornut 2016-02-21 23:55:01 +0100
  • f8fede1d8b Added ColorPicker3/ColorPicker4, refactoring ColorEdit3/ColorEdit4 adding a bunch of flags and access to picker (wip #346) ocornut 2016-02-21 23:23:30 +0100
  • ab97b42935 Merge branch 'master' of https://github.com/ocornut/imgui ocornut 2016-02-21 18:10:44 +0100