Commit Graph

3438 Commits

Author SHA1 Message Date
ocornut
93917e76a6 Combo: value label is properly clipped inside the closed combo frame 2015-02-08 15:39:40 +00:00
ocornut
9596a2b4f1 ShowExampleAppLongText() demonstrate manual clipping. 2015-02-08 14:32:58 +00:00
ocornut
d5d8dedadd Calling SetCursorPos() automatically extends the contents size 2015-02-08 14:20:00 +00:00
ocornut
9e3f8adfac Added CalcListClipping() helper. 2015-02-08 13:44:09 +00:00
ocornut
29e0aad739 Renamed GetTextLineSpacing to GetTextLineHeightWithSpacing. Added GetCursorPosX/GetCursorPosY 2015-02-08 13:37:20 +00:00
ocornut
c116dad304 Fixed holdng scrollbar creating a small feedback loop with calculation of contents size 2015-02-08 13:29:55 +00:00
omar
2bce6bf085 Merge pull request #121 from thevaber/master
Added tint_col parameter to ImageButton
2015-02-04 23:18:57 +01:00
Václav Patejdl
d135d91e27 Added tint_col parameter to ImageButton 2015-02-04 19:19:43 +01:00
ocornut
209ab823d6 Cleanup of previous merge. Moved rarely used Get/Set InternalState functions to the bottom of the list to avoid being misleadnig. 2015-02-04 09:43:11 +01:00
ocornut
bab66cc490 Merge branch 'jtilander-master' 2015-02-04 09:30:53 +01:00
ocornut
e36fad65dd Merge branch 'master' of https://github.com/jtilander/imgui into jtilander-master
Conflicts:
	imgui.cpp
2015-02-04 09:30:03 +01:00
ocornut
4e33787c2f Comments 2015-02-04 09:01:00 +01:00
ocornut
311c0ca9e5 If mouse was first clicked outside of ImGui bounds we also cancel out hovering. 2015-02-03 10:35:43 +00:00
ocornut
c6de9502f8 Avoid requesting IO.WantCaptureMouse if earlier click/hold was outside of ImGui window 2015-02-03 09:56:19 +00:00
ocornut
94c7eddb17 Comments 2015-02-02 19:50:28 +00:00
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
Jim Tilander
087ded0c71 If you install with brew, it also installs links into /usr/local -- and if the version changes having the extra link line here will cause warnings. 2015-02-01 11:02:33 -08:00
Jim Tilander
e6318abcee Merged changes from original master 2015-02-01 09:09:03 -08: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
Jim Tilander
3478e3a708 Enabled us to create the internal state on client side allocated memory, e.g. a heap 2015-01-31 21:55:19 -08:00
Jim Tilander
1be4604027 Fixed pointer dereferencing error from merge 2015-01-31 20:35:42 -08:00
Jim Tilander
e9ff2f3d24 Merge branch 'master' of https://github.com/ocornut/imgui 2015-01-31 20:31:41 -08:00
Jim Tilander
8149bace7b Added a way to replace the internal state pointer so that we can optionally share it between modules (e.g. multiple DLLs) 2015-01-31 20:28:24 -08: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
Jim Tilander
98e71afa72 Removed the dependency on realloc functionality 2015-01-31 16:17:39 -08: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