Commit Graph
29 Commits
Author SHA1 Message Date
omar 3b3a32cbd6 Merge pull request #168 from mmozeiko/fixassert
Replace assert() with IM_ASSERT in some functions copied from stb.h
2015-03-20 08:37:13 +00:00
omar c151f35751 Merge pull request #166 from jsimmons/master
Remove spurious assert
2015-03-19 11:46:31 +00:00
omar 9a6aebeb96 Merge pull request #163 from biller23/patch-1
Examples: typo in ImGui_ImplGlFwGL3_KeyCallback() forward-declaration.
2015-03-18 20:26:03 +00:00
omar 4e245f0bfb Update README.md
Link to Synergy sources
2015-03-18 14:06:39 +00:00
omar 6f150d8800 Merge pull request #161 from adamdmoss/boxmax
GetItemBoxMax: fix obsolete function copy-n-paste bug
2015-03-18 11:30:32 +00:00
omar d4c0ecea0e Merge pull request #159 from adamdmoss/master
Examples: OpenGL: if content window doesn't have focus, tell ImGui we don't have a mouse position.
2015-03-16 11:46:29 +00:00
ocornut 6e12d31417 Scrollbar: moved from Begin() into its own Scrollbar() function + tidying up 2015-03-08 16:37:03 +00:00
ocornut f021080851 Scrollbar: Clicking inside the grab box doesn't modify scroll. Subsequent movement always relative. (#150).
Big change, rather thoroughly tested but hope I didn't break something.
2015-03-08 16:24:11 +00:00
ocornut 32312e538e Renamed style.ScrollBarWidth to style.ScrollbarWidth to be consistent with other casing. 2015-03-08 15:03:55 +00:00
ocornut afc23a5617 Tidying up & Chinese glyph range includes missing punctuation. 2015-03-08 13:28:44 +00:00
ocornut 79ddddd910 Merge branch 'master' of https://github.com/ocornut/imgui 2015-03-08 13:26:14 +00:00
omar 830d9f4183 Merge pull request #157 from usagi/master
Fix the Japanese glyph range; include Punctuations
2015-03-08 13:26:02 +00:00
ocornut a579d6f521 Scrollbar tidying up variable names 2015-03-08 12:39:50 +00:00
ocornut d251204564 ShowTestWindow: fixed "undo" button of custom rendering applet + default size 2015-03-08 12:09:57 +00:00
ocornut 2af8e0238c Added GetScrollPosY(), GetScrollMaxY() (mentioned in #150) 2015-03-08 12:04:38 +00:00
ocornut a5daea9408 Added style.GrabSizeMin 2015-03-08 11:43:57 +00:00
ocornut 849c72c5c3 Forward declare struct in imgui.cpp. Removed two forward declarations leaking in imgui.h 2015-03-08 11:32:39 +00:00
ocornut ede45389f4 Scrollbar grab have a minimum size (mentioned in #150) 2015-03-08 11:24:02 +00:00
ocornut e843539aab ShowTestWindow: example apps showing even if main window is collaposed. 2015-03-08 10:38:13 +00:00
ocornut 92c35e2772 Rename ImCrc32() -> ImHash() 2015-03-07 23:53:03 +00:00
ocornut a691a245b7 GetID() doesn't need to account for empty IDStack 2015-03-07 23:52:26 +00:00
ocornut 62c900606d Fixed .ini saving for windows using ### marker. FindWindowSettings() uses ID compares (#107) 2015-03-07 23:35:36 +00:00
ocornut f9473b807b Fixed comments 2015-03-07 22:49:16 +00:00
ocornut 3c225bbf88 Fixed typo in comments 2015-03-07 22:24:45 +00:00
ocornut 45a35c24c8 ShowTestWindow(): Added "Manipulating Window Title" example. 2015-03-07 22:20:34 +00:00
ocornut a8c58c7a35 Minor tweaks. 2015-03-07 22:01:06 +00:00
ocornut fbbde3a7c0 Updated documentation, better FAQ on ids and usage of "##" and "###" (#107) 2015-03-07 21:54:46 +00:00
ocornut 81a742bf54 Added "###" syntax to specify label that isn't part of the hashed ID (#107) 2015-03-07 21:53:33 +00:00
ocornut 3cac434737 Minor FindTextDisplayEnd() optimisation 2015-03-07 19:36:18 +00:00