Commit Graph
100 Commits
Author SHA1 Message Date
ocornut 5df28b101d Added ImGuiWindowFlags_NoCollapse flag 2015-02-02 09:49:12 +00:00
ocornut 4169d2c8db Fixed more pedantic warnings 2015-02-02 09:06:51 +00:00
ocornut 0a6577a6df Fixed warnings 2015-02-02 08:51:45 +00:00
ocornut cc3d41dbab Version number 1.31 wip 2015-02-01 14:47:21 +00:00
ocornut 85763150e8 Fixed / removed unncessary allocation in Render() 2015-02-01 14:42:09 +00:00
ocornut bde3f6b90d Removed the dependency on realloc functionality #117 + fixed one alloc in NewFrame() 2015-02-01 14:39:13 +00:00
ocornut 56bf9ea067 Added comment on MemFreeFn as suggested by #119 2015-02-01 14:27:22 +00:00
ocornut 6777145853 InputText: Filtering private Unicode range 0xE000-0xF8FF seems like glfw on OSX uses those? 2015-02-01 14:08:37 +00:00
ocornut 1120f5d720 Merge branch 'master' of https://github.com/ocornut/imgui 2015-02-01 13:07:01 +00:00
ocornut 2dcbe83951 Added DroidSans.ttf font in repository 2015-02-01 13:06:56 +00:00
omar 59d564b322 Update README.md 2015-02-01 10:18:39 +00:00
ocornut b623f97d9f Examples: DirectX11: fixed build setting of Release mode. 2015-02-01 09:33:51 +00:00
ocornut e636e0d2aa Warning fixes (fix #118) 2015-02-01 09:33:51 +00:00
omar c300a6e6c4 Update README.md 2015-02-01 00:46:40 +00:00
ocornut 8fb15e3d4b Web: update picture. 2015-02-01 00:32:56 +00:00
omar c343e95a0a Update README.md 2015-02-01 00:15:18 +00:00
ocornut bcb3753774 Web: Redone one screenshot so it fits in github website without resizing 2015-02-01 00:14:29 +00:00
ocornut b69f82ee34 New set of pictures! 2015-02-01 00:01:01 +00:00
ocornut 49569a903c Shortened text 2015-01-31 23:55:47 +00:00
ocornut 2f5c754ef1 InputText: process character input before Return because they may come together (IME batch) 2015-01-31 23:51:00 +00:00
ocornut 35c0842bcf Examples: DirectX11: fixed handling of unicode character inputs. 2015-01-31 23:26:53 +00:00
ocornut bebd2da1f1 Wrapping g.ActiveId assignment into a function for easy breakpoint. 2015-01-31 22:57:59 +00:00
ocornut 3f6091b26b Pedantic grammar fix 2015-01-31 21:27:26 +00:00
ocornut 5834297928 Examples: DirectX11: increasing vertex buffer size (would really need a dynamic buffer size)
+ Delete unused code
2015-01-31 21:12:59 +00:00
ocornut 381c7428c1 Examples: changed default background color. 2015-01-31 20:08:43 +00:00
ocornut a548c9b0d5 Version change 2015-01-31 19:10:04 +00:00
ocornut ca10c49e27 Embedded a mouse cursor that can be drawn for you by setting io.MouseDrawCursor 2015-01-31 18:55:05 +00:00
ocornut 68bad703ee ImColor::HSV() helper + color buttons demo 2015-01-31 17:15:07 +00:00
ocornut 8d1583d611 Added ImColor() inline helper. Image/ImageButton() now takes ImVec4 for consistency and honor window alpha. 2015-01-31 16:44:55 +00:00
ocornut cb3b69c879 Exposed ColorConvertHSVtoRGB, ColorConvertRGBtoHSV, ColorConvertFloat4ToU32 2015-01-31 16:36:12 +00:00
ocornut 3cf47988b0 Added ImageButton() using regular framing + override framing size (#73) 2015-01-31 16:21:12 +00:00
ocornut 2ecc285919 ImDrawList::AddCallback() allows for custom rendering (e.g. 3D scene inside a imgui widget)) 2015-01-31 15:24:55 +00:00
ocornut 82666cdc57 ShowTestWindow() early out if window is collapsed. Drawing the 2 columns example differently. 2015-01-31 10:20:37 +00:00
ocornut 4437293b79 Added ImDrawList::SplitDrawCmd() to force multiple draw calls for depending rendering/blending + Comments 2015-01-31 09:51:25 +00:00
ocornut 64679a0b03 ImFontAtlas::Build() does a sanity memset on glyph rectangles. 2015-01-29 17:44:46 +01:00
ocornut 4c4bbcb451 Examples: fixed custom rendering example canvas size. 2015-01-29 15:04:56 +01:00
omar 229ba6ea18 Update README.md 2015-01-29 15:01:44 +01:00
ocornut 27161d2a98 Added io.DisplayVisibleMin / io.DisplayVisibleMax to allow for virtual / scrolling display.
+ remove duplicated "Setup outer clipping rectangle" block in Begin))
2015-01-29 14:20:25 +01:00
ocornut 962ef3924a Added extra asserts and tweaked code in Begin() 2015-01-29 14:07:20 +01:00
ocornut 07f69966f8 ImDrawList::AddImage() color parameter defaults to white 2015-01-29 13:46:34 +01:00
ocornut 79042a3a3c GetVoidPtr() functions like GetInt, GetFloat. Renamed GetIntPtr/GetFloatPtr to GetIntRef/GetFloatRef 2015-01-29 10:22:32 +01:00
omar 5b180afc4e Merge pull request #116 from emoon/master
Added Set/GetVoidPtr in ImGuiStorage
2015-01-29 10:10:48 +01:00
ocornut 00842d18e4 Speculative GCC warning fix (again) 2015-01-24 11:30:40 +01:00
ocornut 4535f5f899 Fixed some warnings with Clang/GCC 2015-01-24 11:18:31 +01:00
ocornut 638babb0dd Examples: added simple drawing app example for using ImDrawList and custom drawing 2015-01-23 01:38:04 +01:00
ocornut 32b8ad7381 Fixed mouse aiming within InputText() - broken during 01/18 merge 2015-01-23 00:02:44 +01:00
ocornut 7530f3c985 Added IsItemActive() - replace IsItemFocused()
ClipAdvance() --> ItemAdd() - nb: return value is inverted
2015-01-22 23:54:05 +01:00
ocornut 70188c5623 Added comments 2015-01-22 11:03:24 +01:00
ocornut f1ccd32cb1 stb_truetype: implementation is now static + submitted PR to origin. 2015-01-21 23:45:21 +01:00
ocornut 26174cba85 Added InvisibleButton() 2015-01-21 23:03:25 +01:00
ocornut dbffbacaf6 Added IMGUI_DISABLE_STB_***_IMPLEMENTATION 2015-01-21 11:59:11 +01:00
ocornut 26f93e6660 IMGUI_STB_NAMESPACE define Stb stuff in a namespace (trying stuff to reduce problems with multiple implementations) 2015-01-21 11:54:23 +01:00
ocornut 9524d76fe8 Documentation 2015-01-20 22:37:18 +01:00
ocornut 942e1ca811 Notes, todo items 2015-01-20 10:37:30 +01:00
ocornut b24d4d0538 Ignore lists 2015-01-20 01:04:34 +01:00
ocornut b0eac255ca Warning fixes for 64-bit architectures 2015-01-20 01:01:25 +01:00
ocornut 53f4fd38e4 Merge branch 'master' of https://github.com/ocornut/imgui 2015-01-18 15:12:47 +00:00
ocornut 56ac857cac Added stub for obsolete GetDefaultFontData() to help the user upgrading 2015-01-18 15:12:41 +00:00
omar 7ea9253c31 Update README.md 2015-01-18 12:56:59 +00:00
ocornut a1c0c0e298 stb_truetype.h mod comment 2015-01-18 12:54:35 +00:00
omar b87f9a19c8 Merge pull request #113 from ocornut/2015-01-truetype
Merge - TTF font loading, mulitple fonts, Image support
2015-01-18 12:27:32 +00:00
ocornut 7e2305eb36 Comments 2015-01-18 12:22:17 +00:00
ocornut 46fbff50cf Documentation 2015-01-18 12:19:49 +00:00
ocornut bfe894406d ImFontAtlas: some more optimisations / cleanup. 2015-01-18 12:12:16 +00:00
ocornut e685e49781 ImFontAtlas: reduced number of temporary allocation when building lots of input ranges 2015-01-18 11:55:58 +00:00
ocornut edcf2d3bf6 Examples: more comments on loading fonts. 2015-01-18 11:38:14 +00:00
ocornut 8386e4fb7e Fix handling of NULL GlyphRanges. Asserting on AddFontFromFileTTF() failure. 2015-01-18 11:36:23 +00:00
ocornut ed23598e49 Font documentation 2015-01-18 11:24:06 +00:00
ocornut ca81fd3a34 Removing the binary_to_c() comment, link to license for ProggyClean 2015-01-18 11:19:11 +00:00
ocornut 1916a0c78c Renamed FontAtlas to Fonts. Further cleanup/comments. 2015-01-18 10:46:49 +00:00
ocornut 1f8d209202 Fixed more clang warnings + AddFontFromMemoryTTF() not honoring font_no parameter 2015-01-17 23:21:06 +00:00
ocornut 37dcf58e2f Fixed clang warnings 2015-01-17 23:13:54 +00:00
ocornut 0dad59b032 Merge remote-tracking branch 'origin/master' into 2015-01-truetype 2015-01-17 22:57:35 +00:00
ocornut e666920784 ImFont: small optimization to our (incorrect) handling of TAB
TAB is still handled as 4-spaces width (which is incorrect)
But CalcTextSize is simplified.
2015-01-17 22:53:54 +00:00
ocornut 5ad9a2f119 Comments on new API 2015-01-17 22:38:10 +00:00
ocornut 2c31599bcc ImFontAtlas allows loading multiple fonts into same texture. Revamped new init API for 1.30 2015-01-17 22:15:29 +00:00
ocornut a3e368a477 Fixed alignment of ColorEdit4() label 2015-01-17 17:19:07 +00:00
ocornut cb9a3235be Removed PixelCenterOffset, uncesssary 2015-01-17 17:17:18 +00:00
ocornut ad92018bc0 Fixed lower-right rounded triangle rendering precision.
PixelCenterOffset is handled very inconsistently, needs to be fixed.
2015-01-17 17:03:22 +00:00
ocornut 43c8b5e0d2 Examples: DirectX11: use linear sampler to be in sync with other examples. 2015-01-17 16:52:21 +00:00
ocornut 014f88b1fc Font fixes for horizontal centering within frames 2015-01-17 15:44:25 +00:00
ocornut edee014ab8 ImDrawList merging commands with same texture 2015-01-17 14:13:08 +00:00
ocornut 3e30ad3802 PushFont/PopFont changes texture at high-level in current draw list - faster 2015-01-17 14:00:43 +00:00
ocornut 7ebd7ef9ac Added PushFont/PopFont API 2015-01-17 13:40:56 +00:00
ocornut 79d1a9d941 Commenting asserts. 2015-01-17 12:27:27 +00:00
ocornut 97fcee0d0d Fix usage of multiple Begin/End pair for the same window, handling of move in End() was stealing Active ID 2015-01-16 10:55:49 +00:00
ocornut ab8d2782c6 Merge remote-tracking branch 'upstream/master' into 2015-01-truetype
Conflicts:
	imgui.cpp
	imgui.h
2015-01-15 18:07:44 +00:00
ocornut f61e8e6e26 Tooltip always auto-resize. May look into max-over-xx-seconds policy later. 2015-01-15 18:00:10 +00:00
ocornut 2082487366 Allow SetNextWindowPos() to affect tooltips. 2015-01-15 17:47:53 +00:00
ocornut 584c7ffac8 Added SetCursorScreenPos() helper (WindowPos+CursorPos = SrceenPos) 2015-01-15 14:41:22 +00:00
ocornut 2d7a2310fd Collapsing header also honor FrameRounding 2015-01-15 10:29:51 +00:00
ocornut 62ecdd21a5 Examples: Added a color slider for the background color + tweak first example use of button.s 2015-01-15 09:59:18 +00:00
ocornut 02f0dbca37 ColorEdit3: clicking on color square change edit-mode, removing color-edit mode button by default. 2015-01-15 09:49:12 +00:00
ocornut 8ba93d947c Added FrameRounding setting (default to 0 for now). 2015-01-15 09:14:44 +00:00
ocornut 3c8f010c29 Fixed TooltipBg color not being honored by tooltip + no minimum tooltip size. 2015-01-14 22:10:48 +00:00
ocornut 4f6643cc0c Fix missing glyph handling in modified stb_truetype.h (ttf branch) 2015-01-14 22:05:13 +00:00
ocornut 188165a063 Fix stupid crash on fallback glyph handling (ttf branch) 2015-01-14 21:59:39 +00:00
ocornut 08b50cce12 TODO list update 2015-01-14 21:58:30 +00:00
ocornut 04eca0c375 TODO list update 2015-01-14 13:43:41 +00:00
ocornut a372d67f47 Improve memory reserve policy for Clipboard/ImGuiBuffer 2015-01-14 13:04:33 +00:00