mirrors
/
imgui
mirror of https://github.com/ocornut/imgui
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,763 Commits 9 Branches 125 Tags 306 MiB
Commit Graph

2763 Commits

Author SHA1 Message Date
omar e8dd435ccd Merge branch 'mkeeter-is-popup-open' 2017-08-16 13:43:02 +08:00
omar d2259f65e5 Undo part of 32dbe836d0 to keep the same name for both overloads (#891, #799) 2017-08-16 13:42:41 +08:00
omar f98376d02b Merge branch 'is-popup-open' of https://github.com/mkeeter/imgui into mkeeter-is-popup-open 
# Conflicts:
#	imgui.cpp
 2017-08-16 13:19:15 +08:00
omar a83f7083ed BeginPopupEx() uses ImGuiID internally 2017-08-16 13:06:14 +08:00
omar e682362f35 TODO list update, comments 2017-08-16 12:54:51 +08:00
omar f827c8448a Merge pull request #1282 from jadwallis/master 
ImFontAtlas: Make font atlas padding between packed glyphs configurable
 2017-08-16 10:45:07 +08:00
James Wallis 9239e91dc9 Whitespace fix to previous 2017-08-15 14:12:32 +01:00
James Wallis 718f00d651 Make font atlas packing padding configurable 2017-08-15 14:11:04 +01:00
omar 01b99bbe09 TODO list update 2017-08-15 00:36:15 +08:00
omar cd17af0d33 Renamed 2017-08-15 00:09:03 +08:00
omar 03aae93f3e TODO list update (merging a first batch of things I had laying around, +60 entries) 2017-08-14 21:14:42 +08:00
omar 7b7845d764 ImFont::CalcWordWrapPositionA: minor optimization 2017-08-14 21:00:44 +08:00
omar a6d69f04c0 PlotHistogram: bars are drawn based on the position of zero (#828) 2017-08-14 17:20:05 +08:00
omar d258287c92 Revert d2c219d #826 + tidying up ImFont::RenderChar() 2017-08-14 16:53:38 +08:00
omar 3d6e037c23 Comments (#1034) 2017-08-14 16:51:14 +08:00
omar bd3dfc0eba Moved TODO list to TODO.txt 2017-08-14 16:51:14 +08:00
omar d2c219df84 Merge pull request #826 from swetland/patch 
ImFont: add RenderGlyph() to allow rendering of individual glyphs post-query
 2017-08-14 16:50:20 +08:00
omar 2b7fe73a08 Window size can be loaded from .ini data even if ImGuiWindowFlags_NoResize flag is set (#1048, #1056) 2017-08-14 13:27:19 +08:00
omar c1e1e015c4 Style: Tweaked default border (which is off by default) to be less noticeable (#707, #1019) 2017-08-14 13:07:55 +08:00
omar 97fccbdb73 Demo: Fixed conflicting id introduced in be9628494a . Added tooltip. 2017-08-14 13:05:03 +08:00
omar 648f75b245 Style: renamed ImGuiCol_Columns_*** to ImGuiCol_Separator_*** (BREAKING), Separator() uses this color as well. (#707, #1019) 2017-08-14 13:04:32 +08:00
omar 6a4064e5f2 PathArcToFast: Minor renaming for clarification. Comments. 2017-08-14 12:25:35 +08:00
omar 8c61a4eb4c Fonts: Adding references to the fact that .OTF fonts are supported (but haven't renamed the entry points) 2017-08-14 11:29:54 +08:00
omar 41076188ca Merge pull request #1277 from luk1337/master 
ColorPicker: Fix broken ImGuiColorEditFlags_NoAlpha flag check - not restoring Alpha when clicking on reference color.
 2017-08-12 12:53:13 +08:00
LuK1337 8352d43a0c Fix broken ImGuiColorEditFlags_NoAlpha flag check 
* Fixes warning:
  imgui.cpp:9295:98: warning: enum constant in boolean context [-Wint-in-bool-context]
 2017-08-11 22:52:40 +02:00
omar 908b025c3c Fixed (unlikely) Ini saving crash if the ImGuiWindowFlags_NoSavedSettings gets removed from a window after its creation (#1000) + minor FAQ tweaks 2017-08-12 01:23:39 +08:00
omar 0f126a5b07 Update README.md (small wording bits, inspired by #1093) 2017-08-12 01:05:24 +08:00
omar b4fe5d36a4 Examples: OpenGL3+SDL: Fix types to uses GlEnum (#1147) 2017-08-12 00:46:58 +08:00
omar 048322f3fd Merge pull request #1147 from TinyTinni/master 
Examples: OpenGL3+GLFW3: Fix types to uses GlEnum (#1147)
 2017-08-12 00:43:34 +08:00
omar 5eef7dd82f Demo: Consoles: Added "Copy" button to demonstrate LogToClipboard 2017-08-12 00:43:55 +08:00
omar 08265bfbd9 RenderArrow(): fix warning. re-orderer lines to match enum order. 2017-08-11 14:44:53 +08:00
omar d7cad903aa Documentation tweaks 2017-08-11 14:29:27 +08:00
omar 7e452ec737 Renamed ImGuiSetCond_XXX type and enums to ImGuiCond_XXX, kept old enums under #ifdef IMGUI_DISABLE_OBSOLETE_FUNCTIONS 2017-08-11 13:36:28 +08:00
omar 53d1b1e929 ColorPicker: Fixes for when ImGuiColorEditFlags_NoOptions flag is set: always read a default picker type + forward flag to sub ColorEdit widgets. (#346) 2017-08-10 10:25:50 +08:00
omar fed18d3203 Removed old ValueColor() helpers. (#346) 2017-08-09 23:04:26 +08:00
omar fc5ab0cb8d RenderCheckMark() tidying up 2017-08-09 22:56:01 +08:00
omar 4fd148f4f9 Added ImFontAtlas::GlyphRangesBuilder helper + doc 2017-08-09 22:42:03 +08:00
omar 43e2abbee3 Comments, FAQ entry (#586, #1105) 2017-08-09 20:27:59 +08:00
omar 55b99d753c Minor string typo 2017-08-08 23:12:23 +08:00
omar be9628494a Demo: Rearranged everything under Widgets in a more consistent way. 2017-08-08 18:04:31 +08:00
omar d888de4483 Demo: Merged a few demo tweaks from navigation branch to minimize drift. 2017-08-08 17:49:12 +08:00
omar a78ef7a369 Comments 2017-08-08 16:07:17 +08:00
omar 942cb0e1f2 Added SetColorEditOptions(). ColorPicker4: context menu to select picker type and alpha bar. Reorganized flags (again!). (#346) 2017-08-08 15:54:20 +08:00
omar d952a8d3bf Demo: Color widget demo tweaks (#346) 2017-08-08 14:49:45 +08:00
omar a4012fd5b2 Merge branch 'master' into 2016-02-colorpicker 2017-08-08 11:30:10 +08:00
omar b5ad88627d Merge various documentation tweaks, comments, todos from the Navigation Branch to reduce drift a little 2017-08-08 11:27:48 +08:00
omar a1bcc8392e Fixed GetScrollMaxX() debug left-over from 7096fd8500 (#1271) 2017-08-08 11:15:34 +08:00
omar 1c991b525a Merge remote-tracking branch 'origin' into 2016-02-colorpicker 2017-08-07 22:34:30 +08:00
omar 0ab722c3c5 Columns: First first column appearing wider than others (#1266) 2017-08-07 22:28:09 +08:00
omar d43c25d8f4 SetScrollHere() tweak to make the code a little less confusing 2017-08-07 21:54:41 +08:00