Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2024-12-22 15:46:35 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,356 Commits 13 Branches 79 Tags 86 MiB
6d3a980f38
Commit Graph

3747 Commits

Author SHA1 Message Date
ocornut
88a00f77e9 Cleanup - using ImRect more consistently for ImGui-side cliprect data 2015-08-06 08:23:05 -06:00
ocornut
f1fb62fa6d Cleanup - shuffle functions around (#219) 2015-08-06 08:11:33 -06:00
Jonathan Adamczewski
0911597550 Remove inline qualifiers inside .cpp 
Use of inline in the .cpp file causes link errors with gcc.
 2015-08-07 15:41:22 -07:00
ocornut
15cfa63e97 Comments 2015-08-05 19:09:13 -06:00
ocornut
692a38c0fc Merge branch 'master' into 2015-07-cleanup 2015-08-05 17:41:43 -06:00
ocornut
f2b652a39e Comments 2015-08-05 17:38:17 -06:00
ocornut
e7f1e28b6b Merge branch 'master' into 2015-07-cleanup 2015-08-05 17:27:47 -06:00
ocornut
4b4f6d78ee InputFloat() fixed 0 decimal_precision 2015-08-05 17:26:04 -06:00
ocornut
a54995eace RoundScalar() fallback use powf(10.f, -x) instead of 1.0f/powf(10.0f,x) 2015-08-05 17:11:20 -06:00
ocornut
9b19f8c19d Merge branch 'master' into 2015-07-cleanup 
Conflicts:
	imgui.cpp
 2015-08-05 16:57:31 -06:00
ocornut
f6e21b7ab7 InputInt() also hexadecimal input (awkwardly via ImGuiInputTextFlags_CharsHexadecimal but we will allow fmt string in InputInt* later) 
+ Fix for large ints constant assignment
 2015-08-05 16:47:46 -06:00
ocornut
cc8ff4c8d1 RoundScalar() use a lookup table to avoid calling powf(10.0f, x); 2015-08-05 16:17:11 -06:00
ocornut
f0f2afa87d InputInt() doesn't cast to float, fix handling lost of precision with large integer. Added primitives to support more data types. 2015-08-05 16:08:53 -06:00
ocornut
a793ad682d Merge branch 'master' into 2015-07-cleanup 
Conflicts:
	imgui.cpp
 2015-08-05 15:29:38 -06:00
ocornut
ebd25cf1a3 Minor comments 2015-08-05 15:13:13 -06:00
ocornut
e20b90154c Comments 2015-08-05 11:04:13 -06:00
ocornut
3ee2fac892 Slider: fixed using FramePadding between frame and grab visual. Scaling that spacing would look odd. 2015-08-05 11:00:00 -06:00
ocornut
e42bec5ba2 Fixed scaling of checkbox and radio button for the filling of "active" visual 2015-08-05 10:50:20 -06:00
ocornut
155873a6b0 Added GetContentRegionAvail() helper 2015-08-05 10:43:12 -06:00
ocornut
60b46cc712 Comment (#219) 2015-08-05 09:34:07 -06:00
ocornut
815d1d9be4 Merge remote-tracking branch 'origin' into 2015-07-cleanup 
Conflicts:
	imgui.cpp
 2015-08-03 08:12:57 -06:00
ocornut
3aca446817 Added ImFontAtlas::AddFontFromMemoryCompressedBase85TTF() 2015-08-03 08:10:10 -06:00
ocornut
da3baebd43 Fixed lower-right resize grip hit box not scaling along with its rendered size (#287) 2015-08-02 09:15:36 -06:00
ocornut
4b29cc9e10 Exposed relevant functions in imgui_internal.h (#219) 2015-08-01 21:57:24 -06:00
ocornut
26a992c6f6 Updated to stb_truetype 1.07 (back to vanilla version as our minor changes are now in master & fix #280) 2015-08-01 07:22:52 -06:00
ocornut
6c63d80aa4 Tidying up InputTextApplyArithmeticOp() 2015-07-30 23:59:51 -06:00
ocornut
f63beeae86 Internal version of LogText() -> LogRenderedText() + shallow tidying up 2015-07-30 23:48:59 -06:00
ocornut
faa609a43c Internal cleanup ParseFormatPrecision() doesn't take a reference 2015-07-30 23:14:29 -06:00
ocornut
f8646338c3 Merge remote-tracking branch 'origin' into 2015-07-cleanup 2015-07-30 23:00:11 -06:00
ocornut
7650d4cc67 Internal SliderFloatAsInputText() -> InputFloatReplaceWidget() 2015-07-30 22:59:30 -06:00
ocornut
abf823c6f6 Tidying up 2015-07-30 22:49:10 -06:00
ocornut
58ee08f214 Todo list notes 2015-07-30 22:18:07 -06:00
ocornut
040f3950a3 Merge remote-tracking branch 'origin' into 2015-07-cleanup 
Conflicts:
	imgui.cpp
 2015-07-30 21:54:07 -06:00
ocornut
e6b29b70b4 Make internal SliderFloatAsInputText() take a size to match the calling widget 2015-07-30 21:51:55 -06:00
ocornut
c639f65eb7 Merge remote-tracking branch 'origin' into 2015-07-cleanup 
Conflicts:
	imgui.cpp
 2015-07-30 21:37:47 -06:00
ocornut
02fbb36918 ImDrawList: Add missing support for anti-aliased thick-lines (#133, also ref #288) 2015-07-30 21:11:07 -06:00
ocornut
a79ee94fc4 Removed unnecessary assignment + added comment 2015-07-30 20:59:41 -06:00
ocornut
709c4c3168 Merge remote-tracking branch 'origin' into 2015-07-cleanup 
Conflicts:
	imgui.cpp
 2015-07-30 20:42:12 -06:00
ocornut
527208ad7c Default font encoded as base85 saves ~100 lines / 26 KB of source code (from @mmalex) 2015-07-30 19:36:55 -06:00
ocornut
fddc871870 Columns: never assume horizontal space for scrollbar if NoScrollbar flag is set. 2015-07-30 12:32:20 -06:00
Xo Wang
8d45c89352 Remove non-text character at start of imgui.cpp 2015-07-26 19:18:04 -07:00
ocornut
4468ec001e Fixed warning in console example (we're iterating chars) 2015-07-22 06:38:19 -06:00
ocornut
fb83323b1d Tidying up 2015-07-21 20:13:12 -06:00
ocornut
62c888177a Tweaks 2015-07-21 20:06:34 -06:00
ocornut
7552f48d7b ImLoadFileToMemory() default parameters 2015-07-21 17:46:49 -06:00
ocornut
94f085aa3e Update comments (#219) 2015-07-21 17:19:11 -06:00
ocornut
e32f0931e8 Missing includes for imgui_draw.cpp (#219) 2015-07-21 17:08:20 -06:00
ocornut
dace68b6fd Big cleanup, split imgui.cpp into imgui_demo.cpp,imgui_draw.cpp imgui_internal.h (#219) 2015-07-21 17:00:28 -06:00
ocornut
60dce8bc22 Fix to get all code ShowTestWindow() copiable outside. Moved ShowMetricsWindows() above. (#219) 2015-07-19 11:45:03 -06:00
ocornut
83ebbebadd Fixed inconsistent declaration of ImVec2 privates operators 2015-07-18 22:37:08 -06:00
ocornut
5a4b521855 Added ImDrawList::AddText() shorthand helper 2015-07-18 21:50:23 -06:00
ocornut
74908a9513 Fixed angles in ImDrawList::PathArcTo(), PathArcToFast() being off by an extra PI for no reason 2015-07-18 18:45:37 -06:00
ocornut
479211808f ImDrawList::AddPolyLine() tidying up in AA path 2015-07-18 17:31:40 -06:00
ocornut
cdbf71ac12 Added ImGuiWindowFlags_NoInputs for input-passthru window 
Would be more useful with finer control over display layer
 2015-07-17 16:36:04 -06:00
ocornut
0ab620c2b9 Combo() clamp popup to lower edge of visible area 2015-07-17 16:14:04 -06:00
ocornut
20db726a9a Version number 1.44 WIP 2015-07-17 16:03:13 -06:00
ocornut
4015414978 InputtextMultiline(): honor negative size consistently with other widgets 2015-07-17 16:01:21 -06:00
ocornut
3b53a6513a Button() honor negative size consistently with other widgets that do so 2015-07-17 15:58:23 -06:00
ocornut
eca26ae91d Build fix for MinGW (#276) 2015-07-17 13:38:55 -06:00
ocornut
99c5f5735c Tweak button sizes 2015-07-17 07:08:51 -06:00
ocornut
e8cb874afe Version number 1.43 2015-07-17 06:51:25 -06:00
ocornut
1266e4a181 Added a gratuitous About window 2015-07-16 20:58:26 -06:00
ocornut
d6117e33d0 AddInputCharactersUTF8: shallow tweaks (#274) 2015-07-15 22:14:04 -06:00
Daniel Gibson
be8fb858cc Add ImGuiIO::AddInputCharactersUTF8(char* utf8str) 
It'll convert the utf8 string to ImWchar's and passes each of them
to AddInputCharacter().

Very handy for SDL2 SDL_TEXTINPUT events, which provide a buffer with an
UTF-8 string.
 2015-07-16 05:15:03 +02:00
ocornut
3ff04c95d5 Minor tweaks 2015-07-15 17:18:46 -06:00
ocornut
d170620816 Comments 2015-07-15 14:59:42 -06:00
ocornut
80276ef07b Fixed ClearInputData() 2015-07-15 14:48:46 -06:00
ocornut
6c3ab6fc9b ImFont: fixed minor bug with CPU-side vertical clipping of text. 2015-07-15 13:34:59 -06:00
ocornut
a56768463a Examples: moved demo bits around. 2015-07-15 13:16:35 -06:00
ocornut
d750df9189 Fix for Shutdown() 2015-07-15 12:37:42 -06:00
ocornut
baa2328b99 Tweak to RenderCheckMark() 2015-07-15 12:31:37 -06:00
ocornut
8081e81e55 Fixed warnings + label 2015-07-15 11:56:07 -06:00
ocornut
1a3ef63132 Fixed parameters array size declaration (wouldn't have a side-effect but weird and misleading) 
Thanks Coverity
 2015-07-15 09:36:39 -06:00
ocornut
368d2c3568 OverlayDrawList readier for pushing elements (not exposed yet) 2015-07-15 09:26:03 -06:00
ocornut
035ff302d2 ImFontAtlas: moved application of FontDataOwnedByAtlas to AddFont() 2015-07-15 08:45:10 -06:00
ocornut
95f489ac1f Merged AA branch in master! (#133) 2015-07-15 08:00:12 -06:00
ocornut
3e3d9f9a69 ImFontAtlas: allow AddFontDefault to take a config 2015-07-15 07:58:33 -06:00
ocornut
99a92ee7c5 Comments (fixed old comments) 2015-07-15 07:46:31 -06:00
ocornut
8952b93b2f Include for alloca() 2015-07-15 07:31:32 -06:00
ocornut
fcec337061 Examples: Simplified font examples comments. 2015-07-15 07:05:34 -06:00
ocornut
815168c7ef ImFontAtlas: new AddFont() API, oversampling, subpositiong, merging fonts, etc. (#182, #220, #232, #242) 2015-07-15 07:01:21 -06:00
ocornut
6ae8062ca0 ImFont: comments, minor bits 2015-07-14 15:51:19 -06:00
ocornut
c02f9b58ef ImFont: Cleanup to be compatible with over-sampling (not enabled) 2015-07-14 12:41:02 -06:00
ocornut
fc6545830b Examples: displaying more font information. 2015-07-14 10:28:55 -06:00
ocornut
faec745438 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives 2015-07-14 09:23:50 -06:00
ocornut
8cfd963fda Popups: removed an apparently unnecessary test in CloseInactivePopups() that broke Combo boxes inside menus (#272) 2015-07-14 09:21:41 -06:00
ocornut
355cbf6326 Examples: added tests for Combo box in sub-menu test and MenuItem in a normal window (#272) 2015-07-14 09:10:31 -06:00
ocornut
52c820e7b0 Metrics: more details in popup stack (#272) 2015-07-14 09:09:52 -06:00
ocornut
ba9317b924 ImFont: storing offsets as X0/Y0/X1/Y1 analoguous to examples for stb_truetype 2015-07-13 16:08:49 -06:00
ocornut
5b053dd350 Fix for OverlayDrawList being ready to append commands (not exposed publicly yet anyway) 2015-07-13 15:52:57 -06:00
ocornut
7eca4e2a7f Merge bits 2015-07-12 11:05:30 -06:00
ocornut
fbb9113118 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives 
Conflicts:
	imgui.cpp
 2015-07-12 11:02:46 -06:00
ocornut
4565bf9813 Demo: custom rendering example uses AddRectFilledMultiColor() 2015-07-12 10:52:20 -06:00
ocornut
6520b6c458 ImDrawList: added AddRectFilledMultiColor() helper + minor optimisation. 2015-07-12 10:48:06 -06:00
ocornut
7a0004eb86 Revert 2015-07-11 18:15:34 -06:00
ocornut
d10d0343b2 Plot() function can take 0.0f for both scale_min/scale_max to calculate scale 2015-07-11 18:10:43 -06:00
ocornut
e681937f66 Delete merging artefact that survived for a day 2015-07-11 08:41:11 -06:00
ocornut
fd44b9440b Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives 
Conflicts:
	imgui.cpp
 2015-07-10 21:45:25 -06:00
ocornut
b67593a4b1 Changed SameLine() parameters from int to float. 2015-07-10 19:36:34 -06:00
ocornut
8094aa78d2 Fixed incorrect assert triggering when code steal ActiveID move user moving window by calling e.g. SetKeyboardFocusHere() 2015-07-10 18:54:26 -06:00
ocornut
827ff970cd InputText: Added ImGuiInputTextFlags_AlwaysInsertMode flag 2015-07-10 18:47:55 -06:00
ocornut
d2701727b9 InputText: added ImGuiInputTextFlags_NoHorizontalScroll flag. Added HasSelection() helper in ImGuiTextEditCallbackData as a clarification. 2015-07-10 18:17:46 -06:00
ocornut
398ef1a212 Comments 2015-07-08 17:10:14 -06:00
ocornut
245cf36522 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives 2015-07-08 17:09:47 -06:00
ocornut
890585cde8 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives 2015-07-08 17:08:51 -06:00
ocornut
08b1dd1035 Version number 1.43 WIP 
Bits
 2015-07-08 17:08:37 -06:00
ocornut
fec09e37ab Disable warnings, undo f4aae6b9ec (#265 #266) 2015-07-08 17:05:24 -06:00
Stephan Dilly
f4aae6b9ec fix minor clang-x64 warnings 
fixes #265
 2015-07-09 00:00:28 +02:00
ocornut
e5bea65582 Version number 1.42 2015-07-08 12:59:26 -06:00
ocornut
b36ff2fec3 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives 2015-07-08 10:30:30 -06:00
ocornut
44c23e0eed Allowing DeltaTime==0.0f to not assert 2015-07-08 09:48:10 -06:00
ocornut
67d93156df Fixed clang/gcc warnings (#133) 2015-07-07 21:47:33 -06:00
ocornut
54c2665032 AA branch: undo d35c1a9e66, thickness is back but goes through non-AA path (#133) 2015-07-07 20:56:58 -06:00
ocornut
439040bb25 AA branch: more comments on breaking changes (#133) 2015-07-07 20:30:46 -06:00
ocornut
d03b046ef4 AA branch: Agressively renamed all fields of ImDrawList, ImDrawCmd, ImDrawData to match the rest of our coding convention (#133) 2015-07-07 20:17:07 -06:00
ocornut
d35c1a9e66 AA branch: removed the 'thickness' parameter from ImDrawList::AddLine() 2015-07-07 18:34:29 -06:00
ocornut
ac56e4e209 AA branch: API breaking change documentation 2015-07-07 18:31:41 -06:00
ocornut
af7f35d7c2 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives 2015-07-07 18:22:18 -06:00
ocornut
87ebe95fd6 Columns/ImDrawList: dispatch render of each column in a sub-draw list and merge on closure, saving draw calls (#125) 2015-07-07 18:19:01 -06:00
ocornut
f4fc008a2a Fixed ListBoxHeader() not honoring negative sizes the same way as BeginChild() or BeginChildFrame() (#263) 2015-07-07 16:53:09 -06:00
ocornut
acf58c6223 More debug-build friendly ImVector<> use micro optimisations for the most bottle-neck bunchs 2015-07-07 13:54:06 -06:00
ocornut
bfa7d86070 AA branch: further use of ImVector<> Data/Size 2015-07-07 12:58:36 -06:00
ocornut
c3ced1bd71 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives 
Conflicts:
	imgui.cpp
 2015-07-07 12:42:29 -06:00
ocornut
3869e10574 ImVector<> access to Size/Capacity/Data (#262) 2015-07-07 12:39:08 -06:00
ocornut
25882c47a3 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives 
Conflicts:
	examples/directx11_example/imgui_impl_dx11.cpp
	examples/directx9_example/imgui_impl_dx9.cpp
	examples/opengl3_example/imgui_impl_glfw_gl3.cpp
	examples/opengl_example/imgui_impl_glfw.cpp
	imgui.cpp
 2015-07-07 12:15:35 -06:00
ocornut
502e360ee5 Removed the majority of size_t from the code. ImVector<> now uses int. (#262) 
May trigger new compilation warnings?
 2015-07-07 12:09:25 -06:00
ocornut
aeae03f4ac Fixed minor zealous Clang warning (demo code intentionally uses strdup() to be copiable) 2015-07-07 12:05:15 -06:00
ocornut
4d42760c0b Metrics window: "Show clipping rectangles when hovering ImDrawList" enabled by default 2015-07-06 22:10:44 -06:00
ocornut
de6dfe8c5d ImRect (internal) fixed ImVec4 constructor, argh (broken e7e2fcdd19) 2015-07-06 22:05:27 -06:00
ocornut
92b61d2ee4 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives 2015-07-06 21:47:09 -06:00
ocornut
b92396b46a Optimisation, removed the duplicate ClipRectStack in ImGuiWindow, storing single value 2015-07-06 21:46:12 -06:00
ocornut
6a22835f63 AA branch: ImDrawList: rename commands to cmd_buffer 
Not strictly necessary but while we're doing minor breakage let's do
them at all once.
 2015-07-06 21:09:05 -06:00
ocornut
e7e2fcdd19 ImRect (internal) made constructors more non-optimised compilation friendly 2015-07-06 20:59:01 -06:00
ocornut
a17e47fe14 ImDrawList: fixed non-merged commands when equal clip rectangles are in the two first commands 2015-07-06 20:38:06 -06:00
ocornut
5782c69c2a Metrics window: calculate bounding box of actual vertices when hovering a draw list. 2015-07-06 16:34:41 -06:00
ocornut
9db4b35168 Fixed ImRect.Add(ImVec2&) which was broken and somehow unused 2015-07-06 11:13:05 -06:00
ocornut
0ff2a6ff64 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives 
Conflicts:
	imgui.cpp
 2015-07-06 10:56:50 -06:00
ocornut
d6987d1586 ImDrawList store pointer to their owner name for easier auditing/debugging. Metrics windows render clip rectangle when hovering. 2015-07-06 10:52:49 -06:00
ocornut
c52cefa2c2 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives 2015-07-05 22:27:50 -06:00
ocornut
0d5e6e125c Documentation (#133 #254) 2015-07-05 22:26:01 -06:00
ocornut
0676efd37f AA branch: added ImDrawData::DeIndexAllBuffers() helper (#254) 2015-07-05 22:09:55 -06:00
ocornut
b2b616be00 AA branch: ImDrawCmd idx_count -> elem_count 2015-07-05 22:09:15 -06:00
ocornut
f3303fa84f AA branch: io.RenderDrawListsFn signature changed to take ImDrawData, neater and future proof breaking of the render API (#133 #254) 2015-07-05 22:03:46 -06:00
ocornut
2633325b9f Comments 2015-07-05 21:55:24 -06:00
ocornut
562aecdaa5 Removed obsolete GetDefaultFontData() function that would assert anyway (obsoleted 2015/01/11) 2015-07-05 20:56:01 -06:00
ocornut
3fa4451936 PlotLines(), PlotHistogram(): fixed incorrect hovering test (would trigger tooltip when menu is open) 2015-07-05 20:47:25 -06:00
ocornut
1c160adbba Comments 2015-07-05 20:38:18 -06:00
ocornut
c9676554b9 MenuItem() can be activated on release (#245) 2015-07-05 20:27:06 -06:00
ocornut
56553f33b8 AA branch: added style.AntiAliasedLines, style.AntiAliasedShapes (#133) 2015-07-05 19:09:53 -06:00
ocornut
19e59421e5 AA branch: comments, inlining minor ops 2015-07-05 18:42:41 -06:00
ocornut
46c440d186 AA branch: AddPolyline() stores normals on stack 2015-07-05 18:19:22 -06:00
ocornut
c09af38804 AA branch: AddConvexPolyFilled() store normals on stack 2015-07-05 18:05:55 -06:00
ocornut
a74ca9025f AA branch: oops, ImInvLengthSqr() is ImInvLength() 2015-07-05 17:37:55 -06:00
ocornut
a8b5f77591 AA branch: AddPolyline(), AddConvexPolyFilled() a little more readable with more consistent naming 2015-07-05 17:36:07 -06:00
ocornut
0292c82b9c AA branch: fix lower-right bound of frame outlines 2015-07-05 16:52:06 -06:00
ocornut
2f21347803 CollapsingHeader() fixed label rendering outside in columns context where cliprect max isn't aligned with header 2015-07-05 16:37:49 -06:00
ocornut
7959fbe992 AA branch: CollapsingHeader() rounding down half window padding 2015-07-05 16:35:41 -06:00
ocornut
f04c2002d6 AA branch: fixed column offsets not always aligned to the pixel causing CollapsingHeader() border to incorrectly anti-alias 
Fixing framed CollapsingHeader() inside columns, where
GetContentRegionMax() doesn't return pixel aligned rounded position.
 2015-07-05 16:32:26 -06:00
ocornut
0d7ca3da24 AA branch: AddLine() api adds the 0.5f offset (unsure about that yet) 2015-07-05 16:24:55 -06:00
ocornut
18fa8e1c7e Fixed IsMouseDragging() (fix #260) 2015-07-04 16:46:30 -06:00
ocornut
3b94c37efc AA branch: minor tweaks + disabled debug code that disable AA when holding Ctrl 2015-07-04 12:59:55 -06:00
ocornut
f435e42561 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives 
Conflicts:
	examples/opengl_example/imgui_impl_glfw.cpp
 2015-07-04 12:44:25 -06:00
ocornut
d76bc3434e Added DragFloatRange2() DragIntRange2() helpers (#76) 2015-07-04 12:17:11 -06:00
ocornut
7437b43b2d Fixed warnings for more pedantic settings (#258) 2015-07-03 08:15:56 -06:00
ocornut
b69d7d9df3 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives 2015-07-02 21:47:48 -06:00
ocornut
6826ab3ffd Added GetKeyIndex() helper. 2015-07-02 21:32:29 -06:00
ocornut
0f9e2f8173 Tweaked scrolling example code (#150) 2015-07-02 21:22:16 -06:00
ocornut
42efc29def SetScrollFromCursorPos() -> SetScrollHere() (#150) final call ! 2015-07-02 21:03:15 -06:00
ocornut
4eba6cd470 Added SetScrollY(), SetScrollFromPosY(). Renamed SetScrollPosHere() to SetScrollFromCursorPos(). (#150) 2015-07-02 20:53:45 -06:00
ocornut
b37a326163 Renamed GetScrollPosY() to GetScrollY(). (#150) 
Necessary to reduce confusion along with other scrolling functions,
because positions (e.g. cursor position) are not equivalent to scrolling
amount.
 2015-07-02 20:47:04 -06:00
ocornut
9bedcb5304 Added GetCursorStartPos() necessary for using scroll target relative to beginning of window content (#150) 2015-07-02 14:46:49 -06:00
ocornut
1b01137c90 Fixed text baseline alignment of small button (no padding) after regular buttons 
Currently being a coward and only doing it via the SmallButton() entry
point.
 2015-07-02 12:44:48 -06:00
ocornut
bbc22ac8ca Comments + remove trailing comma 2015-07-02 11:26:35 -06:00
ocornut
90ec28f6de Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives 2015-07-02 10:23:21 -06:00
ocornut
e0da1e0658 Split into CaptureKeyboardFromApp() / CaptureMouseFromApp() 2015-07-02 09:20:15 -06:00
ocornut
77fad80e9f Added CaptureInputsFromApp() to manually enforce e.g. keyboard capturing 2015-07-02 09:10:31 -06:00
ocornut
57f70a29b2 Fixed a bug with TextUnformatted() clipping of long text (#257) 2015-07-02 07:42:29 -06:00
ocornut
0e5b64ecd2 SetScrollPosHere() Minor hack for effective "scroll to top" to appear like user expect it (#150) 
Compensate the difference between WindowPadding and ItemSpacing
 2015-07-01 19:01:27 -06:00
ocornut
824cf5ae85 Fixed window padding being reported incorrectly for child windows with borders when parent have no borders 2015-07-01 18:55:42 -06:00
ocornut
3d7b596a40 SetScrollToPosHere() fixed imprecision + handling lower gap better for bottom alignment (#150) 2015-07-01 18:23:11 -06:00
ocornut
49b7a8e61f Added scroll tracking example with SetScrollPosHere() (relate #150) 2015-07-01 18:01:43 -06:00
ocornut
b74d8e4c87 SetScrollPosHere() takes a y centering ratio and can be used to aim the top or bottom of the window (relate #150) 2015-07-01 17:51:44 -06:00
ocornut
067b7d909a Style: Added GrabRounding (works well with AA branch). Followup to #212 2015-06-30 15:02:59 -06:00
ocornut
d3c0bfefb3 AA branch: render axis aligned rect bypassing the AA path 2015-06-30 14:51:25 -06:00
ocornut
b30d08d63a AA branch: bits 2015-06-30 14:24:50 -06:00
ocornut
c39372e7d5 Title bar uses TitleBgActive color even when window has popups/menus over (#253) 2015-06-30 13:52:00 -06:00
ocornut
47826830af Adding TitleBgActive color - still issues with popups/menus (#253) 2015-06-30 13:40:13 -06:00
ocornut
c71b183965 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives 2015-06-30 13:31:56 -06:00
ocornut
4bb94a9e4d AA branch: more optimisations. 2015-06-30 13:27:35 -06:00
ocornut
a8f0eb5ec6 AA branch: more optimisations. 2015-06-30 13:12:45 -06:00
ocornut
bbdf36cd3a AA branch: minor optimisations, merging loops 2015-06-30 13:09:07 -06:00
ocornut
c3040dee35 AA branch: more inline. 2015-06-30 12:55:14 -06:00
ocornut
077285ae57 AA branch: tidying up, inline PathStroke PathFill 2015-06-30 12:51:52 -06:00
ocornut
aaefe458df AA branch: cleanup 2015-06-30 12:44:03 -06:00
ocornut
ebfe4637d4 Merge branch '2015-04-indexed-rendering' into 2015-03-antialiased-primitives 
Conflicts:
	imgui.cpp
	imgui.h
 2015-06-30 12:43:26 -06:00
ocornut
d57ee2458c AA branch: ImDrawList: renaming of Path based functions so both code paths can cohabit with no confusion 2015-06-29 19:25:41 -06:00
ocornut
5bf30bd6c4 AA branch: Minor optimisations for Debug builds 2015-06-29 19:23:57 -06:00
ocornut
43dcd6ef47 Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering 
Conflicts:
	imgui.cpp
 2015-06-29 15:43:58 -06:00
ocornut
0bf90770b0 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives 
Conflicts:
	imgui.cpp
 2015-06-29 15:40:38 -06:00
ocornut
0e3198edc2 Tidying up - renamed FindBestWindowPos() to FindBesttPopupWindowPos() 2015-06-29 15:18:26 -06:00
ocornut
af0de5f357 Tidying up - ImRect doesn't use ImVec2 operators (so we can expose it later) 2015-06-29 13:30:37 -06:00
ocornut
882c7a8cef Tidying up - ShowUserGuide, ShowStyleEditor only uses public calls 2015-06-29 13:20:28 -06:00
ocornut
039ebb79f4 Tidying up - renamed a few internal functions 2015-06-29 13:18:44 -06:00
ocornut
8b392feba1 Tidying up - moved ImFontAtlas glyph ranges helpers outside of ImFont block 2015-06-29 12:36:24 -06:00
ocornut
0783697f87 Minor tidying up 2015-06-29 10:39:17 -06:00
ocornut
4ac21aaa12 Version number 1.42 wip + todo list entries 2015-06-26 20:48:53 -06:00
Ben Vanik
5cd1a01514 Fixing 64-bit compilation warning caused by implicit size_t->int cast 2015-06-26 18:49:45 -07:00
ocornut
f66be0e7b2 Demo: satisfying buffer size 2015-06-25 21:52:16 -06:00
ocornut
ea2c824192 Version 1.41 2015-06-25 21:38:24 -06:00
ocornut
8224ca16b6 Carriage return in demo tooltip 2015-06-24 20:45:06 -06:00
ocornut
4976bf97a6 Fix for correctness and allow non-auto resized modals to have window minimum size applied - hopefully no-side effects (#249) 2015-06-24 20:35:40 -06:00
ocornut
af5890b276 AutoFit can be triggered on each axis separately via SetNextWindowSize() (mentioned in #249) 2015-06-24 20:08:08 -06:00
ocornut
975ef00682 Minor construction fix (-1.0 is correct "disabled" value for TextWrapPos, didn't have any incidence anyway) 2015-06-24 19:53:41 -06:00
ocornut
d171e48b20 Fixed SetNextWindowPosCenter() being processed too early for windows that are still measuring their size (for #249) 2015-06-23 15:45:34 -06:00
ocornut
5436266963 Added SetNextWindowPosCenter() (#249) 2015-06-23 15:34:44 -06:00
ocornut
bcbf53857c BeginPopupModal() default to NoCollapse for modal windows (#249) 2015-06-23 15:17:27 -06:00
ocornut
06ed9257ef Modal windows centered when appearing (#249) 2015-06-23 14:28:11 -06:00
ocornut
2a041cfbe1 Added GetGlyphRangesCyrillic() helper (#237) 2015-06-23 14:13:22 -06:00
ocornut
0f38a53d28 Added stacked modal windows example (#249) 2015-06-23 13:58:47 -06:00
ocornut
f0311b643a Added modal dialog example (#249) 2015-06-23 13:22:37 -06:00
ocornut
a4cd585f54 Reorganized demo window 2015-06-23 12:47:38 -06:00
ocornut
fe17f6e735 Added modal window darkening of previous windows (#249) 2015-06-23 12:34:15 -06:00
ocornut
8c790a3234 BeginPopupModal() can have an optional close-window button (#249) 2015-06-23 11:08:19 -06:00
ocornut
bce495c581 Added BeginPopupModal() with actual modal behaviour (WIP api) (#249) 2015-06-23 10:02:56 -06:00
ocornut
0b98d3eb26 Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering 
Conflicts:
	imgui.cpp
 2015-06-21 20:01:25 -06:00
ocornut
01cb0dc7f7 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives 
Conflicts:
	imgui.cpp
	imgui.h
 2015-06-21 19:58:30 -06:00
ocornut
0884cb51cd Added IsKeyReleased() (#248), added keyboard & mouse state panel in the demo window 2015-06-21 19:04:43 -06:00
ocornut
68534c2319 Added IsMouseReleased() helper (#248) 2015-06-21 18:15:31 -06:00
ocornut
eec047c9f7 Fixed leak on Shutdown (#200) 2015-06-19 18:14:50 -06:00
ocornut
9e8da4dba0 Comments 2015-06-19 18:09:58 -06:00
ocornut
747999bbaf Fixed mouse wheel scroll issues, introduced a few weeks ago (#200) 2015-06-19 18:01:13 -06:00
ocornut
e7b43b014b Can't scroll with mouse wheel when window is collapsed. 2015-06-19 17:43:51 -06:00
ocornut
1b28f11acb InputTextMultiline() filtering out \r for now (#200) 2015-06-19 17:34:19 -06:00
ocornut
73db855c77 InputTextMultiline() painfully merged most computation passes into one, better clipping, much faster for large text (#200) 2015-06-18 23:23:20 -06:00
ocornut
84987ac3e0 ImFont::RenderText() better vertical clipping for large amount of text (for #200) 2015-06-18 23:08:42 -06:00
ocornut
324b1c2a28 InputTextMultiline(): made ctrl+up/down closer to windows behavior (#200) 2015-06-18 22:35:08 -06:00
ocornut
c4720ec90f InputTextMultiline() fixed a frame of lag in handling vertical scrolling (#200) 2015-06-18 21:20:15 -06:00
ocornut
cd27f8a8e6 InputText(): adjusting selection block height differently for single and multi-line (#200) 2015-06-18 21:01:56 -06:00
ocornut
b524c59c70 InputText(): removed a call to strlen() in the active edit path (#200) 2015-06-18 20:49:20 -06:00
ocornut
2b68a5c0cf InputTextMultine() optimised height calculation for inactive multi-line edit box (#200) 2015-06-18 19:09:04 -06:00
ocornut
86666489df ImFont: CalcTextSizeA() fixed font scaling with fallback character. 2015-06-18 18:31:49 -06:00
ocornut
c6d77f3bf5 InputText: fixed handling of scaled font. re-organized bits of code toward merging all sizes calculations (#200) 2015-06-18 18:31:13 -06:00
ocornut
10b4fa44c1 Fixed framerate counter averaging buffer size (shouldn't have been included in previous commit) 2015-06-18 17:45:11 -06:00
ocornut
26d2b361d1 InputText(): removed extraneous CalcTextSizeW call for tracking cursor/scrolling, remove spike (#200) 2015-06-18 17:40:51 -06:00
ocornut
5f362cabe9 InputText(): char width calculation calls font->GetCharAdvance() directly (#200) 2015-06-18 17:11:20 -06:00
ocornut
60079988bd ImFont::RenderText() faster handling of rendering above clipping rect (useful for #200) 2015-06-18 12:41:48 -06:00
ocornut
846cfc74a2 InputText() clear selection when using undo/redo (#200) 2015-06-18 12:32:55 -06:00
ocornut
d30e8f38b7 InputText() tidying up (#200) 2015-06-18 12:29:43 -06:00
ocornut
8fbb4a566a InputTextMultiline() preserve activeid/cursor/selection when using scrollbar + tidying up (#200) 2015-06-18 11:57:43 -06:00
ocornut
9180126db6 Speeding up some wchar<>UTF8 functions and some specialization for Ascii. (testing 500 KB text for #200) 2015-06-18 11:30:10 -06:00
ocornut
c06373de93 Cleanup 2015-06-18 10:40:11 -06:00
ocornut
d0ea5942a9 InputTextMultiline() can clip + BeginChildFrame() returns bool. (#200) 2015-06-18 08:49:57 -06:00
ocornut
9c399ee3be Demo for InputTextMultiline() (#200) 2015-06-17 18:36:06 -06:00
ocornut
b0e8643523 Demo for InputTextMultiline() (#200) 2015-06-17 18:31:15 -06:00
ocornut
490e9e42ff InputText(): shallow tweaks (#200) 2015-06-17 18:14:25 -06:00
ocornut
5e323561be InputTextMultiline() fixes, vertical scrolling, optimizations (#200) 
Using a child window for multi-line text.
 2015-06-17 17:07:49 -06:00
ocornut
3df91b52ea Increased key repeat rate for non-character input key repeat. 
Dodgy - we should have a match here for character input and
non-character input (e.g. holding 'a' vs holding 'backspace' should be
same rate), but for the earlier we don't have the info?
 2015-06-17 16:02:50 -06:00
ocornut
7dc5228235 InputText: doesn't reset scrolling when active text input becomes bigger than its content. (#200) 
Mostly because it's expensive.
 2015-06-17 15:49:18 -06:00
ocornut
f75b8c72cf InputTextMultiline(): vertical scrolling wip, selection rendering fix (#200) 2015-06-16 21:53:04 -06:00
ocornut
417a7bc29b InputTextMultiline(): multi-line selection draw fix (#200) 2015-06-16 21:19:47 -06:00
ocornut
f1dfc4d7c4 InputTextMultiline(): multi-line selection draw fix (#200) 2015-06-16 21:17:02 -06:00
ocornut
917a1fdbf7 InputText() fixing cancel (#200) 2015-06-16 21:08:54 -06:00
ocornut
73491e5adc InputText() lifted 1024 characters limit (#200) 
Bit messy & not happy with using ImVector<char>
 2015-06-16 21:04:27 -06:00
ocornut
0795a60c6b InputText() fixed multi-line selection clipping. (#200) 2015-06-16 20:35:46 -06:00
ocornut
ec7c1834b3 InputTextMultiline() tabbing to a multi-line edit doesn't select all (unless ImGuiInputTextFlags_AutoSelectAll is set), somehow arbitrary (# 
Seems reasonable
 2015-06-16 20:25:08 -06:00
ocornut
6d31c498c0 InputText: multi-line selection, better scrolling, cleaning up (#200) 
Not horizontally scrolling on char boundaries anymore
 2015-06-16 20:14:54 -06:00
ocornut
d06ad43dca ImFont::RenderText() additional early out (typically performed at TextUnformatted() level for large chunks but this is also useful) (#200) 2015-06-16 17:50:55 -06:00
ocornut
748837acfd Merge remote-tracking branch 'origin' into 2015-06-multiline_textedit 
Conflicts:
	imgui.h
 2015-06-16 17:23:28 -06:00
ocornut
a248575dea Text rendering can be finely clipped cpu-side on top and left axises (for #200) 2015-06-16 17:21:07 -06:00
ocornut
9765559a28 Merge remote-tracking branch 'origin' into 2015-06-multiline_textedit 
Conflicts:
	imgui.cpp
 2015-06-16 15:59:28 -06:00
ocornut
34986771b4 Moved InputFloat() InputInt() below InputText() and not in the middle of internal bits 2015-06-16 15:57:04 -06:00
ocornut
0df7b472c2 InputTextMultiline() WIP - still gazillion problems with selection visualisation & scrolling 2015-06-16 15:46:45 -06:00
ocornut
b360c83e92 Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering 2015-06-14 20:29:10 -06:00
ocornut
7d860a0181 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives 
Conflicts:
	imgui.cpp
 2015-06-14 20:28:19 -06:00
ocornut
6eb1fec7a9 ImFont: added GetCharAdvance() helper. Exposed font Ascent and font Descent. 2015-06-14 17:30:06 -06:00
ocornut
b503e5ee5b ImageButton() changed default bg_col parameter from (0,0,0,1) black to (0,0,0,0) tranparent + drawing frame even when no padding (#243) 2015-06-14 16:18:22 -06:00
ocornut
4f0fa58ff2 Selectable() changed prototype moved flags before size. size override should rarely have been used! sorry. #125 2015-06-14 15:19:47 -06:00
ocornut
cf481e1a7b Selectable() added flags ImGuiSelectableFlags_DontClosePopups , ImGuiSelectableFlags_SpanAllColumns (#125) 2015-06-14 12:41:40 -06:00
ocornut
2bcafc861e SelectableEx - replaced unnecessary extra size_draw parameter by a flag. 2015-06-13 14:20:02 -06:00
ocornut
96496ced5f Metrics windows display storage size 2015-06-11 16:04:06 -06:00
ocornut
039418f393 ColorButton(), ColorEdit4(): colored square stays square, used vertical padding on both axis. 2015-06-09 14:39:27 -06:00
ocornut
6bb06fdb81 Selectable, MenuItem: don't use frame rounding for hovering/selection. 2015-06-09 14:32:37 -06:00
ocornut
3fd4441f70 SetScrollPosHere() fixed imprecisions 2015-06-09 13:14:22 -06:00
ocornut
3ca54ad369 SetScrollPosHere() takes account of item height + more accurate centering 2015-06-09 12:57:27 -06:00
ocornut
e8422f7aa0 SetScrollPosHere() rewrote to that window size is not required at the time of calling, can be used on frame 0 of an auto-resizing window 2015-06-09 12:49:13 -06:00
ocornut
8c86322068 Combo() now using the popup facility. More consistent + when combo open hovering other widgets is disabled. (#241) 2015-06-09 12:35:55 -06:00
ocornut
6f1dd7a688 Allow Set*WindowSize() calls to be used with popups (fix for using e.g. scroll function on the first frame) 2015-06-09 12:32:19 -06:00
ocornut
6807546caf Allow Set*WindowSize() calls to be used with popups. 2015-06-09 11:35:29 -06:00
ocornut
4536668482 Fixed issue with activating a Combo() not taking active id (#241) 2015-06-09 10:09:12 -06:00
ocornut
20088303e9 ImFont: ignoring \r 2015-06-04 12:26:23 +01:00
ocornut
eb75ffdc5d DragFloat(), SliderFloat() Fixed rounding of negative which sometimes made the negative lower range unreachable. 2015-06-03 15:31:08 +01:00
ocornut
0e04dfbad7 Added IsWindowHovered() helper. 2015-06-02 20:57:29 +01:00
ocornut
9928d19af1 Version 1.41 WIP 2015-06-02 14:41:14 +01:00
ocornut
82d4180f39 Bits of TODO list 2015-05-31 21:15:35 +01:00
ocornut
931b8dcdaf Version 1.40 2015-05-31 19:31:02 +01:00
ocornut
a76eea85c8 Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering 
Conflicts:
	imgui.cpp
 2015-05-31 16:59:01 +01:00
ocornut
ade7661b3f Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives 2015-05-31 16:57:43 +01:00
ocornut
8738147aee Windows: pragma link with user32.lib if we are using native clipboard function (unless IMGUI_DISABLE_WIN32_DEFAULT_CLIPBOARD_FUNCS) #238 2015-05-31 15:55:32 +01:00
ocornut
1c2dac2a90 Version increased to 1.40 WIP makes more sense than 1.39 (changelog is huge) 2015-05-31 14:46:28 +01:00
ocornut
04e91500c5 Comments 2015-05-31 14:03:07 +01:00
ocornut
374d160234 BeginPopupContextWindow() in_empty_space_only -> !also_over_items (#126)+ comments 
Sorry if you used this parameter already.
 2015-05-31 12:55:12 +01:00
ocornut
bda0269133 ListBox() uses ImGuiListClipper helper, faster for large lists, assume evenly sized items. 2015-05-31 12:35:21 +01:00
ocornut
eb4ffd5dbd Added ImGuiListClipper helper to avoid using CalcListClipping() directly. 2015-05-31 12:33:24 +01:00
ocornut
446d8abfb0 ListBoxHeader() can return false. Also made ListBox() only use public API. 2015-05-31 11:54:00 +01:00
ocornut
df37df821e RetWindowCollapsed() to IsWindowCollapsed() for consistency. Kept inline indirection. 2015-05-31 11:52:57 +01:00
ocornut
0539be7067 Added IMGUI_DISABLE_OBSOLETE_FUNCTIONS 2015-05-31 11:17:58 +01:00
ocornut
03ff2faacb Comments 2015-05-31 11:01:22 +01:00
ocornut
9417df2a26 Renamed IsRectClipped to IsRectVisible for consistency. Note that return value is opposite! Kept inline redirection function (will obsolete) 2015-05-31 09:12:07 +01:00
ocornut
5ea23977f7 Fixed uninitialized fields in constructor - wouldn't have caused a problem (thanks Coverity!) 2015-05-29 14:54:33 +01:00
ocornut
f1f3424cdd Popups WantCaptureMouse active when popups/menus are active + using tracked mouse button ownership when mouse down (#126) 2015-05-29 11:42:35 +01:00
ocornut
73d1126bf4 Examples: OCD tweaks, a sign that we are near the release! 2015-05-29 11:15:24 +01:00
ocornut
448b262b37 Examples: Comments. 2015-05-29 11:11:50 +01:00
ocornut
83770e5e40 Examples: Tweaks. Usnig sprintf() in user-copiable code. 2015-05-29 11:05:17 +01:00
ocornut
0db6bac590 Examples: Tweaks, demo code creating graph data actually creates data at the correct rate. 2015-05-29 11:01:53 +01:00
ocornut
9ace617e7e Examples: Tiding up. Moved Dragging example higher up. 2015-05-29 10:52:45 +01:00
ocornut
616a7e6c61 Examples: Using a helper function for ? markers 2015-05-29 10:44:30 +01:00
ocornut
d86785ac98 Examples: Fixed Simple Layout example always showing. Using BeginPopupContextItem(). 2015-05-29 10:36:33 +01:00
ocornut
4144c59ce4 Added Simple Layout example applet 2015-05-29 10:29:26 +01:00
ocornut
15a26a479b Fixed auto-filling child window using WindowMinSize at their minimum size, irrelevant. Using an arbitrary small number instead. 2015-05-29 10:24:03 +01:00
ocornut
f0781d3a24 Added GetItemsLineHeightWithSpacing() helper. 2015-05-29 09:00:34 +01:00
ocornut
aaefe462bb Popups: calling OpenPopup() on already open popup doesn't close it's child (#126) 
Fixed previous commit.
 2015-05-28 23:47:01 +01:00
ocornut
78dc54ab3d Popups: calling OpenPopup() on already open popup doesn't close it's child (#126) 
It think it makes more sense? Maybe?
Note that calling OpenPopup() every frame probably doesn't make sense.
 2015-05-28 23:37:11 +01:00
ocornut
7847100ad8 Tweak BeginMenu() code 2015-05-28 23:14:25 +01:00
ocornut
733e079081 Moved CloseInactivePopups() and tweaked. 2015-05-28 23:04:29 +01:00
Branimir Karadžić
123fd73c8c Merge remote-tracking branch 'upstream/master' 2015-05-27 22:01:37 -07:00
Branimir Karadžić
cd9244ab15 Define STBTT_DEF extern when STBTT not compiled with ImGui. 2015-05-27 16:12:52 -07:00
ocornut
dcc7df2b21 Added BeginPopupContextVoid() helper for completeness (#126) 2015-05-27 23:28:53 +01:00
ocornut
235cca4f97 Fix to allow opening popup from a left-click on void or another window (because left-click would normally override focus immediately) (#126) 
Neither appears to be really useful frankly.
 2015-05-27 23:24:39 +01:00
ocornut
1cb6a294b0 BeginPopupContextWindow() rearranged and clarified parameters (#126) 2015-05-27 23:07:24 +01:00
ocornut
b0a9bbf6f6 Popup taking focus deactivate focused widget of other window (#126) 
e.g. focus InputText(), open contextual popup, input text used to stay
focused
 2015-05-27 22:58:49 +01:00
ocornut
f8b7d5c76d Tracking ActiveIdWindow along with ActiveId 2015-05-27 22:53:43 +01:00
ocornut
938528e5ee Added BeginPopupContextItem() / BeginPopupContextWindow() (#126) 2015-05-27 22:36:23 +01:00
ocornut
5b0861768e Fixed GetId()/BeginPopup() accessing current window in "append" mode 2015-05-27 22:26:03 +01:00
ocornut
8c4c421f74 Added IsAnyItemHovered() public helper. 2015-05-27 22:02:12 +01:00
ocornut
70f2ff0e5a No minimum size for popups 2015-05-27 21:59:02 +01:00
ocornut
99ff45ad2e Tweak context menu example 2015-05-27 21:42:16 +01:00
ocornut
90db64d4e3 Added context menu example on a DragFloat widget 2015-05-27 21:39:41 +01:00
ocornut
487500d291 Tweaks 2015-05-27 16:03:44 +01:00
ocornut
7d28fe5915 WIP Menus: Reverted f26de46350 for now (#126) 2015-05-27 15:51:50 +01:00
ocornut
d05c1d58c3 Oops 2015-05-27 15:44:07 +01:00
ocornut
405785ea62 ItemWidthStack can be empty, to remove one allocation per window 2015-05-27 15:42:29 +01:00
ocornut
0a7024c198 Store common stacked settings contiguously in memory to reduce cache misses & unnecessary heap allocations 2015-05-27 15:35:49 +01:00
ocornut
3d36c81241 Added PushButtonRepeat() / PopButtonRepeat(). REMOVED third 'repeat_if_held' parameter of Button() ! 2015-05-27 15:22:09 +01:00
ocornut
d69f2f57ee Added configurable io.KeyRepeatDelay, io.KeyRepeatRate 2015-05-27 15:17:44 +01:00
ocornut
904e187f70 Simplified some widget code, moving alignment to RenderTextClipped() 2015-05-27 14:39:41 +01:00
ocornut
3c264827fd Reordering parameters of internal RenderTextClipped() 2015-05-27 14:24:52 +01:00
ocornut
f841097e99 Button centering left to RenderTextClipped function. 2015-05-27 14:20:50 +01:00
ocornut
f26de46350 Button() closes active popup (#126) unsure about that 2015-05-27 09:28:44 +01:00
ocornut
e6ac9e88aa Refactor Button() and SmallButton() into a shared function ButtonEx() 2015-05-27 09:22:30 +01:00
ocornut
843219daec Spacing + untabify 2015-05-26 22:14:07 +01:00
ocornut
7b8b5754bc EndGroup() carries on the text base offset from the last line of the group (sort of incorrect but better than nothing) 2015-05-26 22:13:07 +01:00
ocornut
6f32684f15 Examples: various usage comments. 2015-05-26 21:36:44 +01:00
ocornut
15113f682e Added TextDisabled(), TextDisabledV() helpers. 2015-05-26 21:10:16 +01:00
ocornut
3a6e6645e6 WIP Menus: Fixed remaining inconsistency with stacks of popups. Activating/closing a menu close the parent popup. Added test case. (#126) 2015-05-26 20:33:48 +01:00
ocornut
90cf77b191 Merge remote-tracking branch 'origin' into 2015-05-menus 2015-05-26 18:03:46 +01:00
ocornut
6b3ccd3edf WIP Menus: Added support for disabled sub-menu (#126) 2015-05-26 18:02:42 +01:00
ocornut
0db122bc3b Comments. Examples: added empty if (MenuItem()) {} statements in more places to better document the typical use cases (#126) 2015-05-26 17:48:28 +01:00
ocornut
fdce095101 Comments 2015-05-26 17:27:35 +01:00
ocornut
d009a85de4 WIP Menus: Implement amazon's dropdown-like triangle test for navigating sub-menus (#126) 2015-05-26 17:09:21 +01:00
ocornut
63a39dd08e WIP Menus: Recursive menu demo (#126). Actually useful to test sub-menu positioning. 2015-05-26 16:14:51 +01:00
ocornut
cdb5e16f70 SelectableEx: use flags internally (similar to ButtonBehavior) 2015-05-26 16:12:40 +01:00
ocornut
4eeba016f6 WIP Menus: Closing sub-menu when hovering something else in the same parent window (#126) 
Immediate open/close is error-prone
 2015-05-26 15:01:04 +01:00
ocornut
83b10f77a9 Comments 2015-05-25 23:47:59 +01:00
ocornut
98540370a0 WIP Menus: Layout in menu-bar tweaks to lay better when mixed widgets (#126) 2015-05-25 23:15:00 +01:00
ocornut
bb8cdcb916 WIP Menus: Layout in menu-bar more standard, allows mixing different widgets in menubar. (#126) 
Still some minor spacing bugs.
 2015-05-25 23:08:22 +01:00
ocornut
83cb040d20 Selectable: text baseline alignment for line that aren't of text height. 2015-05-25 23:03:16 +01:00
ocornut
44ed5640d3 WIP Menus: Sub-menu overlapping amount not hardcoded (#126) 2015-05-24 23:58:40 +01:00
ocornut
0836f69d9b WIP Menus: Fixed style.WindowPadding == 0 leading to zero-sized initial clipping rectangle leading to self-collapsing childs (#126) 2015-05-24 23:56:29 +01:00
ocornut
6c749934ec Combo: empty label doesn't add ItemInnerSpacing alignment, matching other widgets 2015-05-24 23:45:44 +01:00
ocornut
9abcbf73cb WIP Menus: Sub-menus appears over the parent-menu scrollbar if there is one (unsure about that) (#126) 2015-05-24 23:37:47 +01:00
ocornut
63aa035f59 WIP Menus: Fixed estimation of scrollbar width (broke in 292f08b11e) (#126) 2015-05-24 23:25:57 +01:00
ocornut
8c1d7daef8 WIP Menus: Fixed repositioning of menus when there's no room in the 4 quadrants., we still keep them within the visible display area (#126) 
vs popup which prefer to stay away from the mouse cursor
 2015-05-24 23:17:06 +01:00
ocornut
1ab1712849 WIP Menus: Clicking the label of an already open sub-menu doesn't close it unless from a menu-bar (match Windows behavior) (#126) 
Argh,
 2015-05-24 22:33:04 +01:00
ocornut
48ede93a58 WIP Menus: Fixed closing popup on menu item activation when a child menu is open from the popup (#126) 2015-05-24 22:30:48 +01:00
ocornut
53892ab893 WIP Menus: Fixed manually closing submenu affecting position of the following window (#126) 2015-05-24 21:20:10 +01:00
ocornut
292f08b11e WIP Menus: Fixed some alignment issues with non standard styles. Tweaked menu-bar color (#126) 2015-05-24 21:11:11 +01:00
ocornut
14bcfef041 Merge remote-tracking branch 'origin' into 2015-05-menus 
Conflicts:
	imgui.cpp
 2015-05-24 17:32:10 +01:00
ocornut
8cfae35042 Added Dummy() helper 2015-05-24 17:30:59 +01:00
ocornut
89d1340225 WIP Menus: Added Enabled/Disabled option for MenuItem() (#126) 2015-05-23 13:54:57 +01:00
ocornut
485832fe06 WIP Menus: Added BeginMainMenuBar()/EndMainMenuBar() helpers. Added to examples. 2015-05-23 13:43:45 +01:00
ocornut
e6b1e39847 WIP Menus: don't clamp windows within display when a position has been explicitly set by user. Menu item spacing uses ItemSpacing. (#126) 2015-05-23 13:43:13 +01:00
ocornut
e7097d6176 WIP Menus: menus now affected by WindowMinSize (#126) 2015-05-23 13:03:09 +01:00
ocornut
e3f2ad728a Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering 
Conflicts:
	examples/directx11_example/imgui_impl_dx11.cpp
 2015-05-21 22:57:29 +01:00
ocornut
cc3ed515ca Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives 
Conflicts:
	imgui.cpp
 2015-05-21 22:52:46 +01:00
ocornut
882b4a5eb4 Merge remote-tracking branch 'origin' into 2015-05-menus 
Conflicts:
	imgui.cpp
 2015-05-21 22:51:21 +01:00
ocornut
7fbe6574c6 Removed unnecessary PushTextureId/PushClipRect/PopClipRect/PopTextureId on multiple Begin/End pairs 2015-05-21 22:45:32 +01:00
ocornut
8a6d543bc9 ImDrawList: merge draw command better, cases of multiple Begin/End gets merged properly 2015-05-21 22:43:28 +01:00
ocornut
6a1eba2d0a Fixed appending multiple times to an existing child via multiple calls to same BeginChild/EndChild 2015-05-21 22:21:00 +01:00
ocornut
14ab9708be Removed a few empty lines 2015-05-20 10:31:05 +01:00
ocornut
df276b82da Updated FAQ for usage of ## to display empty label 2015-05-19 23:33:55 +01:00
ocornut
e43c5cd3d3 InputText: Fixed cursor generating a zero-width wireframe rectangle turning into a division by zero. 2015-05-18 23:42:12 +01:00
ocornut
0cdd050cd7 WIP Menus: fixed recycling menu level during the same frame (#126) 
We could also enforce "clearing" the window and recycle immediate which
sort of work, but it would be a less tested code path.
 2015-05-18 21:26:46 +01:00
ocornut
6da8a77fa3 WIP Menus: tidying up, fixed hovering in parent popup menu item from child popup (individual popups acts as hovering barrier) (#126) 2015-05-18 19:41:02 +01:00
ocornut
9bdacaf08d WIP Menus: click again to toggle + allow hovering in same menuset even outside of a menubar (#126) 2015-05-18 19:12:36 +01:00
ocornut
75ec4841df WIP Menus: menu opens on press (not release), uses popup style hovering, allow switch between menus at parent site (#126) 2015-05-18 18:44:15 +01:00
ocornut
e674df8101 Merge remote-tracking branch 'origin' into 2015-05-menus 2015-05-18 16:45:55 +01:00
ocornut
097fe51f97 Hovering require to hover same child window. Reverted 860cf578f5 (December 3), replaced by a flag resize grip. 
Might break something if you have childs overlapping non-childs.
 2015-05-18 16:42:55 +01:00
ocornut
060f879816 Tweak internal ButtonBehavior() to ease passing extra options 2015-05-18 16:39:37 +01:00
ocornut
7184de24b8 WIP Menus: scrolling section of the window is clipped by the menu bar (#126) 2015-05-18 15:54:56 +01:00
ocornut
a17c930d1f WIP Menus: Added example menu, move app examples to a sub-menu (#126) 
NB: menus do not react on click yet, with popup-style blocking of other
inputs yet
 2015-05-17 23:19:05 +01:00
ocornut
09abf11e56 WIP Menus: BeginMenuBar() return false on window without a menu bar (#126) 2015-05-17 23:13:53 +01:00
ocornut
4bd43bdb35 Renamed ImGuiWindowFlags_Menu to ImGuiWindowFlags_ChildMenu 2015-05-17 22:28:57 +01:00
ocornut
7f3f3891c0 WIP Menus: fixed case where zero-sized display (e.g. minimised window) clips popups/menus and asserted (#126) 2015-05-17 22:15:40 +01:00
ocornut
88d7b3de23 WIP Menus: fixed hovering handling of menus from menu bars (#126) 2015-05-17 17:21:49 +01:00
ocornut
f2b738648f WIP Menus: menu bars. Still inconsistency with hovering scheme. Will probably follow what Windows does. (#126). 2015-05-17 17:13:45 +01:00
ocornut
6251d37987 WIP Menus: further fixes for resizing (#126) 2015-05-17 15:48:56 +01:00
ocornut
f44526cc45 Selectable(): horizontal filling not declared to ItemSize() so Selectable(),SameLine() works and we can best auto-fit the window 2015-05-17 13:09:46 +01:00
ocornut
e912bcb36d Comments 2015-05-17 12:10:57 +01:00
ocornut
ecda785cbc Popups: fix to allow child popups to be opened from a normal window without an intermediate popup window. 2015-05-15 23:57:43 +01:00
ocornut
4250357ed2 Selectable: using window->WindowPadding() to work within non-padded child windows 2015-05-15 22:39:52 +01:00
ocornut
79a95256e8 Window: fixed auto-fit calculation mismatch of whether a scrollbar will be added by maximum height clamping. 
Also honor NoScrollBar in the case of height clamping, not adding extra
horizontal space.
 2015-05-15 22:36:31 +01:00
ocornut
3115e546aa Style editor: fixed slider for indent spacing. 2015-05-15 21:55:54 +01:00
ocornut
c1b55991c0 Window: fixed child window sizing lag + minimum size clamping lag 2015-05-15 21:40:45 +01:00
ocornut
70f83a3a65 Popups: child popups (menus) hidden on their first frame the same way as regular popup 2015-05-15 20:35:28 +01:00
ocornut
e9b6e437eb Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering 
Conflicts:
	imgui.cpp
	imgui.h
 2015-05-15 17:33:04 +01:00
ocornut
1eafe86627 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives 
Conflicts:
	imgui.cpp
 2015-05-15 17:31:56 +01:00
ocornut
81937d34a8 Popups: made OpenPopup()/close loops reclaim focus and update popup position. It is generally a mistake but it's now more easy to understand 2015-05-15 17:29:42 +01:00
ocornut
fa0f0f4507 ImVector: tweak growth strategy 2015-05-15 13:14:46 +01:00
ocornut
1fe2906923 Metrics: do not count free(NULL) calls. Settings: contiguous allocations for ImGuiIniData. 2015-05-15 12:45:35 +01:00
ocornut
900394a612 Metrics: metrics window shows popups list 2015-05-15 12:24:05 +01:00
ocornut
222a9231bb Examples: Console: example uses standard malloc/free, makes more sense as a copy & pastable example 2015-05-15 12:09:34 +01:00
ocornut
d9ca8f3145 Added IO.MetricsAllocs counter (number of memory allocations 2015-05-15 12:05:05 +01:00
ocornut
d9b2a90773 Popups: fixed child windows within popups vs handling of sub menus. Added examples. 2015-05-15 11:30:51 +01:00
ocornut
748072c045 Popups: identifying popups by their id to avoid conflict when recycling popup durnig same same (CloseCurrentPopup followed by Open+Begin) 2015-05-14 15:15:17 +01:00
ocornut
e57ee2852a Comments 2015-05-14 11:32:12 +01:00
ocornut
1e4c22c206 Added io.MetricsActiveWindows counter (#213) 2015-05-12 16:08:34 +01:00
ocornut
5df542c3c0 ImFontAtlas: doesn't clear input data, left to the application. (#224) 2015-05-12 15:16:12 +01:00
ocornut
4b088ec7e8 ImFontAtlas: Fix toward allowing to add extra font without clearing existing one (need to comment out ClearInputData) (#224) 2015-05-12 15:10:36 +01:00
ocornut
9d9cf31972 ImFontAtlas: added ClearFonts(), making the different clear funcs more explicit (#224) 2015-05-12 14:53:29 +01:00
ocornut
ad79db32c7 Window title text centering tweaks, RenderTextClipped() now has different args for pos_max and clip_max #222 2015-05-12 14:02:45 +01:00
ocornut
356a37edcf Added window title text horizontal alignment option (#222),, ImGuiAlign_ type for future use. 2015-05-12 11:49:24 +01:00
ocornut
03720acaff Merge remote-tracking branch 'origin' into 2015-05-menus 2015-05-12 10:11:14 +01:00
ocornut
9be3319653 Tweaks, comments around ImFontAtlas 
Removed unsigned int from API
 2015-05-12 09:08:47 +01:00
ocornut
9e307d60e3 Merge remote-tracking branch 'origin' into 2015-05-menus 2015-05-11 21:45:13 +01:00
ocornut
515e0c6122 Cleanup, merged duplicate code into a function 2015-05-11 21:44:50 +01:00
ocornut
317744489f WIP Menus: sub-menu arrow alignment take account of extension by other widgets (#126) 2015-05-11 20:58:07 +01:00
ocornut
5082182790 Merge remote-tracking branch 'origin' into 2015-05-menus 
Conflicts:
	imgui.h
 2015-05-11 20:39:19 +01:00
ocornut
ba7a4fc034 WIP Menus: minor cleanup using a ImGuiSimpleColumns helper type (#126) 2015-05-11 20:34:52 +01:00
ocornut
7fb704d308 WIP intermediary branch commit for menus, submenus (some large inconsistencies remaining in API + need cleanup) (#126) 
May remove the ImGuiWindowFlags_Menu alltogether
 2015-05-11 19:52:02 +01:00
ocornut
79198fd6a5 Default item width for AlwaysAutoResize windows expressed as a factor of font height 2015-05-11 19:47:01 +01:00
ocornut
34aad73fd8 Added ImGuiCol_TextDisabled 2015-05-11 19:36:32 +01:00
ocornut
141ac8beab Tweaks 2015-05-11 18:28:30 +01:00
omar
33a2fd368a Merge pull request #218 from paperManu/inputNFlags 
InputFloat2/3/4, InputInt2/3/4: Added extra_flags parameter.
 2015-05-11 16:54:12 +01:00
Emmanuel Durand
b3faed610d Renamed flags to extra_flags in last commit 2015-05-11 11:40:08 -04:00
ocornut
fcd08ed8d4 BeginPopup() API had to be changed! :( Proper support for stacked popups, leading into menus (wip #126) 2015-05-11 15:57:02 +01:00
Emmanuel Durand
94b7c9e307 Input text flags added to InputFloatN and InputIntN 2015-05-11 10:15:22 -04:00
Stefano Cristiano
99a1a85f1f Example fix PopStyleVar on Vertical Slider to avoid assertion 
Adding an explicit ImGui::PopStyleVar to avoid assertion in
CheckStacksSize
 2015-05-11 14:45:49 +02:00
ocornut
4a41ce9414 InputText: make sure Ctrl+V has ONLY the control key pressed (follow up to #214) + tidying 2015-05-11 09:29:10 +01:00
ocornut
c2c43928a9 Untabifiy 2015-05-11 09:26:53 +01:00
ghassanpl
bb2d3a8b41 * make sure letter-key shortcuts have ONLY the control key pressed (fixes bug for AltGr->Ctrl+Alt on windows) 2015-05-10 22:41:28 +02:00
ocornut
6c1084eaa1 Shutdown() test for g.IO.Fonts not being NULL to allow workarounds in case of using multiple contexts #207 2015-05-09 10:27:03 +01:00
ocornut
f293bec97c Added style.ScrollbarRounding #212 2015-05-09 10:13:56 +01:00
ocornut
d23709ce35 Merge remote-tracking branch 'origin' into 2015-05-menus 2015-05-09 10:02:48 +01:00
ocornut
9fe654c6e4 Assert on modifiers stack size mismatch between Begni()/End() pairs #204 
Experimenting with this. It's helpful but not happy with the idea of
ImGui asserting on that sort of user error.
 2015-05-09 09:59:46 +01:00
ocornut
debe6522bb Examples: test for tooltip over popup. 2015-05-07 19:00:17 +01:00
ocornut
33e8fb85cf Allow stacking popups, not really useful yet (wip #126) 2015-05-07 18:43:08 +01:00
ocornut
dd2a578012 Added ImGuiSetCond_Appearing to test the hidden->visible transition. 2015-05-07 18:39:23 +01:00
ocornut
f46557d2d6 MenuItem() draft for popups, with Selected option (wip #126) 2015-05-07 17:21:48 +01:00
ocornut
c36172ebef Tweak RenderCheckMark() 2015-05-07 17:11:32 +01:00
ocornut
85b8967291 Added RenderCheckMark() helper following the font size 
Pretty ugly, not sure what's the right way to solve that automatically,
better shown as an "icon" so it doesn't have to necessarily look like
the font.
 2015-05-07 17:06:07 +01:00
ocornut
13c3f11c66 Comments (#209) 2015-05-07 11:36:16 +01:00
ocornut
fbbe7fee53 Fix "Debug" window stealing focus/popup #208 #209 @thevaber 2015-05-07 11:24:51 +01:00
ocornut
25d8c1af91 Removed inline marker #210 2015-05-07 10:48:05 +01:00
ocornut
e7ffcea33d Removed style.AutoFitPadding, using style.WindowPadding makes more sense (the default values were already the same). 2015-05-03 14:26:47 +01:00
ocornut
b1b23d6ca9 Autofit cancel out one worth of vertical spacing for correct symmetry (group and tooltip already do that) 2015-05-03 13:52:53 +01:00
ocornut
0ca7926b94 Popup auto-border doesn't spread to its childs #197 2015-05-03 13:04:43 +01:00
ocornut
a3a10d4a3c Popup have borders by default #197 attenuated border alpha in default theme 2015-05-03 12:17:53 +01:00
ocornut
47e875314b Plot: overlay label clipped within frame when bigger than frame 2015-05-03 11:32:39 +01:00
ocornut
f00662a5ad Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering 2015-05-02 22:20:48 +01:00
ocornut
08fd6a7e7d Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives 
Conflicts:
	imgui.cpp
 2015-05-02 22:20:14 +01:00
ocornut
d84b5737a6 Popups, Tooltips: fit within display. Hidden during size calculation. Fixed popups flicker when changing size. 
Big change, needed reorder of Begin(). May trigger new bugs.
 2015-05-02 18:22:46 +01:00
ocornut
99e315d2b2 Fix for width of child windows with scrollbar (broken 376a6a5af0) 2015-05-02 18:14:24 +01:00
ocornut
221f36e116 Comments, tweaks, metrics window tweak 2015-05-02 17:54:25 +01:00
ocornut
a3560b274e Tidying up Begin(): using local copy of 'flags' for brevity 2015-05-02 17:45:54 +01:00
ocornut
6ca4b31bf8 Fixed popup resizing (broken 376a6a5af0) 2015-05-02 15:54:35 +01:00
ocornut
a906738ba7 Renamed Visible->Active internally 2015-05-02 13:20:50 +01:00
ocornut
1b5795c96d InputText: fixed incorrect edit state after text buffer is modified by user through callback #206 2015-05-02 12:45:53 +01:00
ocornut
81bf614821 Fix window size after collapsing (broken 376a6a5af0) 2015-05-02 12:35:34 +01:00
ocornut
7fac4013a4 Build fix 2015-05-02 12:22:52 +01:00
ocornut
4e292bf67d Tidying up Begin(): separated blocks needed for auto-resize so it can be moved above position calculation later 2015-05-02 12:20:06 +01:00
ocornut
376a6a5af0 Tidying up Begin() separated blocks needed for auto-resize so it can be moved above position calculation later 
Being cautious again. Hopefully didn't break anything.
 2015-05-02 12:08:24 +01:00
ocornut
46f55fe6f6 Tidying up Begin() 2015-05-02 10:46:24 +01:00
ocornut
3f7f256752 Tidying up. Re-arranged the (first_begin_of_the_frame) blocks in Begin() for further changes. 
Being cautious.
 2015-05-02 10:32:32 +01:00
ocornut
19f7bf90f8 Examples: AutoResize demo doesn't use TextWrapped() 2015-05-01 21:01:54 +01:00
ocornut
07ebb14ce2 Tooltip: fit within display. Added style.DisplayWindowPadding, style.DisplaySafeAreaPadding now strictly for popups/menus. 2015-05-01 20:35:44 +01:00
ocornut
68ccdc4fb8 Comments 2015-05-01 11:07:30 +02:00
ocornut
8fbb42cc6f Added IsKeyDown() IsMouseDown() as convenience instead of reading into IO structures 
Also their existence serves as implicit documentation of what
IsKeyPressed(), IsMouseClicked() does
 2015-04-28 18:12:24 +02:00
ocornut
2440a30444 Columns() distinguish columns-set ID from other widgets as a convenience, added asserts, added more sailors 2015-04-28 18:09:38 +02:00
ocornut
bd23c11a93 Separator() within group start on group horizontal offset #205 2015-04-27 22:19:14 +02:00
ocornut
1d90f099bd Tidying up 
We still have an issue with ImVec4 vs ImRect
 2015-04-26 13:17:56 +02:00
ocornut
6844952d56 Fixed build with Visual Studio 2008 or earlier (via PR #203) 2015-04-24 09:22:29 +02:00
ocornut
c93a562b06 Added ImGuiStorage::GetVoidPtrRef() 2015-04-21 10:12:17 +01:00
ocornut
9119f58ce5 Version number 1.39 WIP 2015-04-21 10:09:20 +01:00
ocornut
37d8d78fc2 Selectable() render into AutoFitPadding only when full-fitting (fix aac99819d6) 2015-04-19 23:37:50 +01:00
ocornut
064b94721e Added DragFloat2, DragFloat3, DragFloat4, DragInt2, DragInt3, DragInt4. 2015-04-19 23:28:57 +01:00
ocornut
94c4e9564d Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering 2015-04-19 23:00:14 +01:00
ocornut
86d1abf3f6 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives 2015-04-19 22:59:53 +01:00
ocornut
05ee36baab Version number 1.38 2015-04-19 22:59:27 +01:00
ocornut
85e18c72d2 ShowTestWindow(): drag example + tooltip. 2015-04-19 22:57:39 +01:00
ocornut
731b003c9d Slider internals: removed unnecessary slider_bb parameter 2015-04-18 19:34:05 +01:00
ocornut
acbd58627f ShowTestWindow(): added a custom label in the format for one of the slider example. 2015-04-18 17:35:40 +01:00
ocornut
c46d5634d4 Columns: mouse dragging uses absolute mouse coords. Fixed dragging left-most column of an auto-resizable window. #125 2015-04-18 13:46:28 +01:00
ocornut
c82f909be1 Active column (when dragged) not clipped so it can release its active state (extends 16ddd796f3) 2015-04-18 12:11:59 +01:00
ocornut
26e469af22 Documentation 2015-04-18 09:19:41 +01:00
ocornut
02de9bd859 DragFloat, DragInt: if step/speed is zero defaults to 1% of range #180 2015-04-17 10:01:39 +01:00
ocornut
4f1acf0d4a Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering 
Conflicts:
	imgui.cpp
 2015-04-17 08:42:36 +01:00
ocornut
1847270a5f Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives 2015-04-17 08:41:16 +01:00
omar
6408ac482c Merge pull request #199 from bkaradzic/master 
Fixed C4267 size_t to unsigned int conversion warning.
 2015-04-17 08:09:07 +01:00
Branimir Karadžić
6920e70e2e Fixed C4267. 2015-04-16 15:52:35 -07:00
ocornut
7fde17e15a ShowMetricsWindow(): renaming locals (not sure about the "shadows a local variable" warning?) 2015-04-16 23:30:48 +01:00
Branimir Karadžić
508d05414a Fixed warning: missing initializer for member. 2015-04-16 14:45:42 -07:00
Branimir Karadžić
b7b3df3c81 Fixed: warning: declaration shadows a local variable 2015-04-16 14:42:17 -07:00
Branimir Karadžić
d24474ea82 Fixed: warning: missing field 'w' initializer [-Wmissing-field-initializers] 2015-04-16 14:39:04 -07:00
ocornut
64db50ba46 TODO list 2015-04-16 10:58:30 +01:00
ocornut
aca85dbea4 Fixed hovering over a popup's child (popups disable hovering on other windows but not their childs) #197 2015-04-16 10:54:56 +01:00
ocornut
de3a154f38 Tweak date/credits 2015-04-14 12:00:12 +01:00
ocornut
43cb4038c6 Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering 
Conflicts:
	examples/directx11_example/imgui_impl_dx11.cpp
	imgui.cpp
 2015-04-14 09:51:28 +01:00
ocornut
0bb89ccee2 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives 
Conflicts:
	imgui.cpp
 2015-04-14 09:49:04 +01:00
ocornut
dd36e8bf2b Renamed IsClipped() to IsRectClipped(). Kept inline redirection function (will obsolete). 2015-04-13 22:04:28 +01:00
ocornut
d11b4160aa Added IsItemVisible(). Made IsClipped() also return false when log is enabled. 2015-04-13 21:52:38 +01:00
ocornut
16ddd796f3 Active widgets is not clipped, so it can always release its active state (mentioned in #143) 
Otherwise a change in layout moving active widget to a clipped region
may lock the active id.
 2015-04-13 20:59:44 +01:00
ocornut
9918ec31d6 Added ResetMouseDragDelta() for iterative dragging operations 2015-04-13 19:54:40 +01:00
ocornut
a143e2e772 Added PushId() GetId() variants that takes string range to avoid user making unnecessary copies 2015-04-13 14:45:27 +01:00
ocornut
750b6c9224 DragFloat() fixed clamping #180 2015-04-13 00:07:41 +01:00
ocornut
6ed06a8dc8 DragFloat() added power parameter for logarithmic drag on both side of zero #180 2015-04-13 00:03:57 +01:00
ocornut
f5ad362912 DragFloat() latch value internally, allows finer control, honor precision settings, slow step with integer works #180 2015-04-12 19:15:55 +01:00
ocornut
b308d2728b Remove stray tabs 2015-04-12 10:45:00 +01:00
ocornut
adae98664e Comment on the newly added binary_to_compressed_c.cpp helper program 2015-04-12 10:31:10 +01:00
ocornut
88725be381 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives 
Conflicts:
	imgui.cpp
 2015-04-11 18:13:43 +01:00
ocornut
7ca21a1bc2 Fixed prototypes 2015-04-11 18:12:11 +01:00
ocornut
ac740170b9 Added ImFontAtlas::AddFontFromCompressedTTF() helper + binary_to_compressed_c.cpp tool 2015-04-11 18:00:09 +01:00
ocornut
bff9a6b6e3 Added ImFontAtlas::AddFontFromCompressedTTF() helper + binary_to_compressed_c.cpp tool 2015-04-11 17:52:51 +01:00
ocornut
c3a71f5472 AA branch: Minor optimisation merge + thickness for non-aa strokes. 2015-04-09 23:00:55 +01:00
ocornut
dbc9b2ec9b Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives 
Conflicts:
	imgui.cpp
 2015-04-09 22:56:13 +01:00
ocornut
6bdb8719e2 Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering 2015-04-09 22:50:18 +01:00
ocornut
a48130b682 ImDrawList: Minor optimisation. 2015-04-09 22:49:18 +01:00
ocornut
e0cd947904 AA branch: Fixes. 2015-04-09 22:40:50 +01:00
ocornut
1e69175403 AA branch: Test disabling aa at runtime for stroke and fill. 2015-04-09 22:31:26 +01:00
ocornut
431e391ccd AA branch: fixed circles. 2015-04-09 21:51:33 +01:00
ocornut
dd893ac4f5 Warning fix. 2015-04-09 21:43:42 +01:00
ocornut
14ddb81f7a AA branch: remove code unnecessary for this branch. 2015-04-09 21:39:56 +01:00
ocornut
39445cf23a Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives 
Conflicts:
	imgui.cpp
	imgui.h
 2015-04-09 21:38:30 +01:00
ocornut
1746b04065 Indexed rendering. Not in main branch because breaks rendering code too much. Will merge in trunk along with more major graphics changes lat 2015-04-09 21:05:35 +01:00
ocornut
500a8a0e02 ImDrawList: bits of renaming. 2015-04-09 21:00:45 +01:00
ocornut
4fa3eee84e Renamed io.MetricsVertices to io.MetricsRenderVertices 2015-04-09 19:47:41 +01:00
ocornut
aa1a96f907 ImDrawList: inline AddVtx() calls for profit in highly debug builds 2015-04-09 18:34:31 +01:00
ocornut
707df6c7b7 ImDrawList: internal refactoring toward a following commit for indexed rendering. 2015-04-09 17:32:03 +01:00
ocornut
742808d835 Tweaks. 2015-04-09 17:24:09 +01:00
ocornut
15f82e0deb Fix rounded frames to follow previous change 2015-04-09 17:20:57 +01:00
ocornut
aa2935968e Renamed AddArcFast() parameter 'tris' to 'filled' 2015-04-09 16:47:20 +01:00
ocornut
f38cca09cf Merge branch 'master' of https://github.com/ocornut/imgui 2015-04-09 16:45:21 +01:00
ocornut
0fc1f5b17f Revert AddArcFast()->AddArc(), removed modulo from function 200d3482dc 2015-04-09 16:45:14 +01:00
Stephan Dilly
2bb6e31520 fix unused variable warning by clang 2015-04-09 16:50:54 +02:00
ocornut
200d3482dc Renamed ImDrawList::AddArc() to ImDrawList::AddArcFast() for compatibility with future API, and changed 2*PI range from 0..12 to 0..16 2015-04-09 00:49:21 +01:00
ocornut
13fab08cdb Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives 2015-04-08 20:37:18 +01:00
ocornut
3c6257b8b9 Fixed IsRootWindowOrAnyChildFocused() crashing if no window has focus (introduced yesterday in c38c54af52) 2015-04-07 14:04:43 +01:00
ocornut
6e99688fa7 Fixed user-facing version of IsItemHovered() ignoring overlapping windows 2015-04-07 14:03:17 +01:00
ocornut
323ae8326e Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives 2015-04-07 13:51:01 +01:00
ocornut
d692286862 Added ShowMetricsWindow() 2015-04-07 13:42:35 +01:00
ocornut
8211081c54 Added (not exposed) DisableHideTextAfterDoubleHash to disable ## processing. 2015-04-07 13:37:30 +01:00
ocornut
33ef3992f7 Added IO.MetricsVertices counter 2015-04-07 13:36:11 +01:00
ocornut
6e4d3dac1a Examples: Fixed ShowExampleAppManipulatingWindowTitle() not doing the right thing, broken in ff35d24bcc 2015-04-07 11:54:53 +01:00
ocornut
c38c54af52 Clicking on void loses keyboard-focus so application can use TAB back 2015-04-06 11:25:07 +01:00
ocornut
fe64da6197 Allow SetWindowFocus(NULL) to remove focus 2015-04-06 11:19:31 +01:00
ocornut
28a45877aa DragFloat() comment examples, not ready for prime-time #180 2015-04-03 16:21:24 +01:00
ocornut
c93f34238e DragFloat() examples #180 2015-04-03 15:18:12 +01:00
ocornut
962aa4c396 DragFloat() double-clicking turns into an input box (along with Ctrl+clicking) #180 2015-04-03 15:15:12 +01:00
ocornut
916a8955ec DragFloat(): passing min>=max (e.g. 0.0f) for range makes the drag unbound #180, removed extra APIs 2015-04-03 15:13:59 +01:00
ocornut
61d886e14b SliderFloat() removed support for unbound/infinite slider, inconsistent. Use InputFloat()/DragFloat() 2015-04-03 15:10:07 +01:00
ocornut
aac99819d6 Selectable() render into AutoFitPadding but do not extend it, fixing small visual gap 
Followup 2e26196aba /  #1
 2015-04-03 14:40:15 +01:00
ocornut
f3967f1183 Combo() adding frame padding inside the combo box. 2015-04-03 14:32:46 +01:00
ocornut
dc52938627 InputInt2(), InputInt3(), InputInt4(): fixed label vertical alignment 2015-04-03 14:22:00 +01:00
ocornut
f7e35ce120 ShowTestWindow() renamed sliders examples to say "slider" 2015-04-03 14:20:04 +01:00
ocornut
1247ce251f Added DragFloat(), DragInt() work in progress #180 2015-04-03 14:07:52 +01:00
ocornut
6aed651f77 ColorEdit4(): tweak code to be a little less ugly (still not a beauty contest winner..) 2015-04-03 11:49:02 +01:00
ocornut
2d157d3af0 ColorEdit4(): hide components prefix if there's no space for them. 2015-04-03 11:25:44 +01:00
ocornut
e6792f84d4 Comments and organization of imgui.h 2015-04-03 10:22:18 +01:00
ocornut
153db91917 Slider: don't call RenderText() on empty label. 2015-04-02 22:39:37 +01:00
ocornut
74f2e53b3b Slider: fix in the unlikely case that style.GrabMinSize is larger than a slider. 2015-04-02 22:38:37 +01:00
ocornut
31fd72bde1 Internal renaming 2015-04-02 21:21:35 +01:00
ocornut
503b8c20de Delete font clear pointer in ImGui state to get a clear crasah instead of a dangling pointer. #181 2015-04-02 17:48:22 +01:00
ocornut
b61b311772 Fixed Begin() returning true on collapsed windows that loaded settings #176 2015-04-02 10:56:59 +01:00
ocornut
a4cf50affe Fix uninitialized fields - MouseCursor set by first call to NewFrame() 2015-04-01 15:08:42 +01:00
ocornut
c0699958ce Fix for Coverity static analysis 2015-04-01 15:05:06 +01:00
ocornut
eb3e640fa6 Fixed style.DisplaySafeAreaPadding handling from being applied on window that never were auto-fit 2015-03-31 00:41:15 +01:00
ocornut
468fcd7b30 Fixed mouse wheel scrolling (broken 2 commits ago 9d16b85ed2) 2015-03-31 00:15:23 +01:00
ocornut
6ba7a74191 AA branch: fix. 2015-03-30 23:57:29 +01:00
ocornut
bb385fabd4 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives 2015-03-30 23:55:40 +01:00
ocornut
0a31531f44 Warning fix in demo code 2015-03-30 21:16:24 +01:00
ocornut
9d16b85ed2 Caching current Font, FontSize into state for quicker/simpler access. 2015-03-29 19:45:03 +01:00
ocornut
e16f2e898a Version number 1.38 WIP 2015-03-29 10:09:14 +01:00
ocornut
ff35d24bcc Comments 2015-03-27 19:34:01 +00:00
ocornut
4ee5a792ff Fixed new collapsed auto-resizing window with saved .ini settings not calculating their initial width #176 2015-03-27 15:18:45 +00:00
ocornut
26991bb2ec Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives 
Conflicts:
	imgui.cpp
	imgui.h
 2015-03-26 22:09:35 +00:00
ocornut
2e26196aba Selectable() fixed misuage of GetContentRegionMax().x 2015-03-26 21:13:03 +00:00
ocornut
a1582874d3 Changed new ImDrawList::AddLine() half_thickness to hickness, just in time for release 2015-03-26 20:24:55 +00:00
ocornut
729e524955 Version number 1.37 2015-03-26 20:16:53 +00:00
ocornut
bcd85e7cd6 Auto contents size aware of enforced vertical scrollbar if window is large than display height. 2015-03-26 20:14:15 +00:00
ocornut
e1de4908f6 Removed bool return value from BegniPopup() at the moment, it is meaningless. Tidying up. 2015-03-26 19:18:06 +00:00
ocornut
4b7818dfc2 Bounding box tests exclude higher bound, so touching items (zero spacing) don't report double hover when cursor is on edge 2015-03-26 19:05:47 +00:00
ocornut
c6112550eb Added Haddock in the (popup) Aquarium 2015-03-26 19:02:54 +00:00
ocornut
f5ba64d8cd Sorting of windows for render doesn't do 3 pass stupidly. Made code a little closer to what it should become with a layering system 2015-03-26 18:51:45 +00:00
ocornut
93c9777165 Fix for using tooltips within popup #126 - will need to rewrite the sorting/layering system shortly. 2015-03-26 18:17:55 +00:00
ocornut
a3086f40fe Renamed internal RenderSortedWindows -> WindowsSortBuffer + cleanup popup closing code 2015-03-26 18:01:40 +00:00
ocornut
fc25d71f84 Refactored duplicated code into an inline function & made more readable 2015-03-26 17:45:11 +00:00
ocornut
a4dc775339 Fixed hovering bug introduced in ac2da570 when popup is inactive #126 2015-03-26 17:35:52 +00:00
ocornut
5fe4ae62cb Popup: clicking on empty space also close popup #126 2015-03-26 17:24:05 +00:00
ocornut
ac2da570f5 When a popup window is open it inhibit hovering on other windows #126 2015-03-26 17:17:42 +00:00
ocornut
de7552047b Simplified example 2015-03-26 17:11:14 +00:00
ocornut
91f8eb7b92 Added early version of BeginPopup/EndPopup() #126 2015-03-26 17:09:17 +00:00
ocornut
d3e8e15e41 Added popup demo code (commented out because I expect to make popup menu proper citizens by next version) 2015-03-26 16:45:44 +00:00
ocornut
325e292427 Selectable(): not specifying a width default to using max of label width and remaining width 2015-03-26 16:41:52 +00:00
ocornut
3268646180 Fixed clipping rectangle's own clipping #177 2015-03-26 16:28:41 +00:00
ocornut
743c815821 Renamed IsItemHoveredRectOnly -> IsItemHoveredRect (introduced after previous release) 2015-03-26 16:18:01 +00:00
ocornut
8b7668d24f Avoid negative clipping rectangle when collapsing windows, ImDrawList could still submit data #177 2015-03-26 16:03:30 +00:00
ocornut
b04ee7e040 Added a more convenient three parameters version of Begin() which Flags more accessible. 2015-03-23 22:50:17 +00:00
ocornut
9d4ba2e27d Using SetNextWindowSize() in examples to encourage its use 2015-03-23 22:45:05 +00:00
ocornut
c9430bb807 Fixed new windows auto-fitting bigger than their .ini saved size 2015-03-22 17:22:39 +00:00
ocornut
b578e86971 Fixed SetWindowPos/SetNextWindowPos affectiving size computation (#175) 2015-03-22 16:08:42 +00:00
ocornut
5737a79c8d Fixed new window from having an incorrect content size on their first frame (#175) 2015-03-22 15:58:44 +00:00
ocornut
7e8f1f1062 Collapsed windows run initial auto-fit to resize the title bar #175 
Maybe have side-effects on window contents? Unsure at this point.
 2015-03-22 15:34:41 +00:00
ocornut
efd927e300 ShowTestWindow: missing TreePop() call in Mouse Cursor section. 2015-03-22 00:00:49 +00:00
ocornut
99314dad73 Updated FAQ 2015-03-21 23:14:21 +00:00
ocornut
072c57b0ca Setting io.LogFilename to NULL disable default LogToFile() (part of #175) 2015-03-21 19:30:46 +00:00
ocornut
85f432dc8d Commented standard library include with the functions we use. Using ImFormatString in place of sprintf (part of #172) 2015-03-21 19:27:29 +00:00
ocornut
7c8946b9b7 Hovering a column set the resize <> mouse cursor #155 2015-03-21 17:48:03 +00:00
ocornut
dee2790133 Mouse cursor offset tweak #155 2015-03-21 15:12:47 +00:00
ocornut
9363e6c154 Prepacking mouse cursors to save on source code size, generally simpler #155 2015-03-21 15:09:01 +00:00
ocornut
810fcd8bcb Added mouse cursor types handling + embed mouse cursor data #155 2015-03-21 13:59:19 +00:00
ocornut
ff1040a38d Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives 2015-03-21 10:55:31 +00:00
ocornut
7f49ac0407 Disabled -Wmissing-noreturn warning for Clang a bit reluctantly - will put back when removing GetDefaultFontData() #173 2015-03-21 10:14:10 +00:00
ocornut
bae32567c3 Fixed unused parameter warning with empty IME handler #173 2015-03-21 10:04:10 +00:00
ocornut
8f90238e53 Fixed IMGUI_DISABLE_TEST_WINDOWS #169 
Fixed warning
 2015-03-21 10:03:03 +00:00
ocornut
d77082af00 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives 2015-03-21 00:54:31 +00:00
ocornut
92a22ab35f Shutdown() freeing a few extra vectors so they don't have to freed by destruction #169 2015-03-21 00:41:34 +00:00
ocornut
c0eab2a164 Moved draw list for io.MouseDrawCursor to state (#169) 2015-03-21 00:22:36 +00:00
ocornut
c18a409a97 Auto-filling child window feed their content size to parent - hopefully fix more problem than it causes? #170 2015-03-20 23:34:03 +00:00
ocornut
6699ccfd1f Tweaked IMGUI_DISABLE_TEST_WINDOWS so it doesn't show in ImGui.h 2015-03-20 22:52:32 +00:00
ocornut
5600ef9701 Merge branch 'allow-to-disable-test-window' of https://github.com/mmozeiko/imgui into mmozeiko-allow-to-disable-test-window 2015-03-20 22:50:07 +00:00
ocornut
5f914c9cbe Comment 2015-03-20 21:06:45 +00:00
ocornut
60f3cfbe98 Fixed MouseDrawCursor feature submitting an empty trailing command in the draw list 
+ Merged 4 draw calls into one, should be merged at lower level.
 2015-03-20 20:50:55 +00:00
unknown
2142181c51 Allow to disable help and test window functionality 2015-03-20 12:08:00 -07:00
ocornut
efeeba99ca Tweak stb_textedit integration to be lenient if another user are leaking their STB_TEXTEDIT definitions/symbols 2015-03-20 14:03:23 +00:00
ocornut
876a755bac Removed unnecessary assert (will crash well enough without) + comment 2015-03-20 11:22:26 +00:00
ocornut
4cd438f663 Added IsMouseDragging(), GetMouseDragDelta() given button and lock threshold. added io.MouseDragThreshold setting. (#167) 
Removed GetItemActiveDragDelta()
 2015-03-20 11:13:18 +00:00
ocornut
c070314621 Reverted 11025b3160, 129339adb0 it breaks collapsing implicit debug window 2015-03-20 10:54:21 +00:00
ocornut
2d81a73f85 Double-clicking on resize grip doesn't keep grip active if mouse button is kept held. 2015-03-20 10:51:33 +00:00
ocornut
2d29907611 Added GetMouseDragDelta() helper. No unlock threshold yet (#167) 2015-03-20 10:49:17 +00:00
ocornut
a71fc8e6a5 Fixed MouseClickedPos not updated on double-click update (fix #167) 2015-03-20 10:46:07 +00:00
Martins Mozeiko
8a553cdcbe Replace assert with IM_ASSERT in few places. 2015-03-19 19:36:17 -07:00
ocornut
282532a92a AA Branch: notes. 2015-03-19 17:04:50 +00:00
ocornut
138e292c4b Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives 
Conflicts:
	imgui.cpp
	imgui.h
 2015-03-19 17:01:54 +00:00
ocornut
ff5378bd66 InputText() last active preserve scrolling position. Reset scroll if widget size becomes bigger than contents. 2015-03-19 16:45:37 +00:00
ocornut
d1aca79f4e InputText() update its width in case of resize initiated programmatically 2015-03-19 16:40:59 +00:00
ocornut
693bd56db2 InputText() removed the odd ~ characters when clipping. Tweaks and fixes of clipping. 2015-03-19 16:04:22 +00:00
ocornut
6e5130ddf4 ShowTestWindow: Added Wdigets Alignment demo under Layout section 2015-03-19 15:10:43 +00:00
ocornut
129339adb0 Removed 'Accessed' flag from ImGuiWindow so GetCurrentWindow() compiles to a simpler accessor 2015-03-19 15:03:10 +00:00
ocornut
11025b3160 Implicit "Debug" window hide itself based on cursor extend instead of the 'Accessed' flag. 2015-03-19 15:01:07 +00:00
ocornut
d953f8d99a ShowTestWindow: Graph checkbox under the label, also demo using BeginGroup/EndGroup() 2015-03-19 14:49:58 +00:00
ocornut
2f0fb2bc34 IsItemhovered() include label and behave consistently (#145) 2015-03-19 14:48:36 +00:00
ocornut
314b87dfaf InputFloat(): fixed label alignment if total widget width forcefully bigger than space available 2015-03-19 14:15:51 +00:00
Josh Simmons
6425b8c1cf Remove spurious assert 
Remove nop assert that causes warnings on Clang.
 2015-03-19 22:42:17 +11:00
ocornut
2a04c2a7bb Fix warnings 2015-03-19 09:33:43 +00:00
ocornut
13caf21018 Use fabs() instead of abs() to ensure we use floating point. #164 2015-03-19 09:06:34 +00:00
ocornut
7a2da7cd02 Added style.DisplaySafeAreaPadding which was previously hard-coded (for use if you can't see the edges of your display, e.g. TV screens) 2015-03-18 22:35:51 +00:00
ocornut
62e8661a37 Fixed assignment order in Begin() making auto-fit size effectively lag by one frame 
Also disabling "clamp into view" while windows are auto-fitting
 2015-03-18 22:35:50 +00:00
ocornut
d45d1d1bca Documentation tweaks and fixes 2015-03-18 19:00:03 +00:00
ocornut
ed0f0dbe87 ImDrawList::AddText() takes a const ImFont* 2015-03-18 14:58:17 +00:00
ocornut
bc88ed0cb9 Fixed bounding measurement of empty groups (fix #162) 2015-03-18 13:21:32 +00:00
ocornut
e14c7e5510 ShowTestWindow(): Added simple dragging widget example. 2015-03-18 13:15:11 +00:00
ocornut
dcaafffe0e Added CalcItemRectClosestPoint() helper. 2015-03-18 13:07:37 +00:00
ocornut
9f1b407def ImDrawList: added thickness param to AddLine(). Added PushClipRectFullScreen() helper. 2015-03-18 12:54:44 +00:00
ocornut
7d26e85b05 IsItemHovered() return false if another widget is active. Added IsItemHoveredRectOnly(). 2015-03-18 12:10:26 +00:00
ocornut
e10d648a28 Added ImGui::GetItemActiveDragDelta() helpers for drag operations 2015-03-18 10:41:46 +00:00
ocornut
215b0065e3 Version number 1.37 WIP 2015-03-18 10:24:56 +00:00
ocornut
7665b8e5e7 Version number 2015-03-18 09:39:38 +00:00
ocornut
d8026e4d84 Added VSliderInt() 2015-03-18 09:39:09 +00:00
ocornut
2a9a2918f8 ShowTestWindow(): more examples of SameLine() usage 2015-03-18 00:07:21 +00:00
ocornut
9c489a081c ShowTestWindow(): added vertical sliders examples, tweaks. 2015-03-17 23:58:22 +00:00
ocornut
be83c07957 Changed mentions of 'box' to be 'rect' 2015-03-17 23:41:20 +00:00
ocornut
7e6112bf26 Changed remaining mentions of 'aabb' to be 'rect' 2015-03-17 23:37:17 +00:00
ocornut
302316c6cf Renamed internal type ImGuiAabb to ImRect 2015-03-17 23:35:12 +00:00
ocornut
7e297945c3 Added BeginGroup() / EndGroup() layout tools (#160) 2015-03-17 23:28:57 +00:00
ocornut
da4bfe3289 Added GetItemRectSize(). Renamed GetItemRectMin()/GetItemRectMax()/IsMouseHoveringBox() to GetItemRectMin()/GetItemRectMax()/IsMouseHovering 2015-03-17 22:36:54 +00:00
ocornut
2e63bf1d16 Button() doesn't add frame padding an explicit size 2015-03-17 22:27:00 +00:00
ocornut
30bc952ac3 Maintaining DC.CursorMaxPos instead of SizeContentsCurrent, simpler, faster and easier to understand. 2015-03-17 22:03:02 +00:00
ocornut
fd7f50d269 Various fixes related to vertical alignment of text after widget of various sizes. Added demos. Toward #160 
Also fixed LabelText() height.
 2015-03-17 20:17:53 +00:00
ocornut
3bd5597cee Moved text vertical centering out of ItemSize() for the moment, in TextUnformatted() it's only user 2015-03-17 17:17:00 +00:00
ocornut
bbaf7e2eee Internal tweaks 2015-03-17 16:40:47 +00:00
ocornut
fe2809fecc Changed default Border and Column border colors to be most subtle, less MS-DOS 2015-03-17 16:16:15 +00:00
ocornut
7e00a41f1b Speculative warning fix 2015-03-16 18:04:51 +00:00
ocornut
cb285c4d35 Examples: uses SetNextWindowPos/SetNextWindowSize when applicable 2015-03-16 11:53:36 +00:00
ocornut
ea720963cf Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives 2015-03-16 10:21:25 +00:00
ocornut
f4970d0e00 Moved static buffers into state 
No recursion in any of those functions. Tho keeping a lock api may be
preferable?
 2015-03-16 09:54:28 +00:00
ocornut
733eedc477 Moved static buffer into state 2015-03-16 09:45:32 +00:00
ocornut
d08ce58876 TreeNodeV() early out if SkipItems is set (avoid formatting string only to be discarded later) 2015-03-16 00:46:03 +00:00
ocornut
0fc9168439 Added InputInt2(), InputInt3(), InputInt4() 2015-03-15 11:30:00 +00:00
ocornut
9c6c8a1ab9 ShowTestWindow() using Unindent() / Indent() instead of an explicit TreePop 2015-03-15 11:21:59 +00:00
ocornut
44826972c0 Added Indent(), Unindent() 2015-03-15 11:19:10 +00:00
ocornut
edde703f8f Renamed style.TreeNodeSpacing to style.IndentSpacing, ImGuiStyleVar_TreeNodeSpacing to ImGuiStyleVar_IndentSpacing 2015-03-15 11:10:48 +00:00
ocornut
304d19a0d8 ShowTestWindow() added multi-components sliders in a sub-node 
+ right align all widgets
 2015-03-15 11:03:55 +00:00
ocornut
b443c7ebe9 Tweak VSliderFloat() 
Not really happy about them
 2015-03-15 10:38:19 +00:00
ocornut
1ac4f33736 Added VSliderFloat() 2015-03-15 01:58:14 +00:00
ocornut
7019cb10f7 "behaviour" -> "behavior" to behave like the greatest number 2015-03-15 01:48:59 +00:00
ocornut
c1547dd79e Internal SliderBehaviour() function now supports vertical sliders 2015-03-15 01:47:12 +00:00
ocornut
ce8150ce69 Slider fix hovering bounding test excluding padding between outer frame and grab 2015-03-15 01:36:29 +00:00
ocornut
6da83cd5b7 Plot: size provided to PlotHistogram(), PlotLines() include the padding (sorry users). 2015-03-15 01:27:37 +00:00
ocornut
98eeeab025 Added ImGuiStyleVar_GrabMinSize enum value for PushStyleVar() 2015-03-15 01:23:56 +00:00
ocornut
1ef789bb68 Slider code tweaks, split into a SliderBehaviour() function 2015-03-14 23:55:07 +00:00
ocornut
ce87c69c38 Passing ImGuiID by copy (32-bits) 2015-03-14 23:44:32 +00:00
ocornut
93befadc0b Slider code tweaks 2015-03-14 23:33:12 +00:00
ocornut
60591dd7c6 Fixed warning and split bit of SliderFloat() into a private ParseFormat() function 2015-03-14 10:30:07 +00:00
ocornut
72855becab Slider code syntax tweaks 2015-03-14 09:36:15 +00:00
ocornut
eff466d77d Fixed parsing of decimal precision back from format string when using %% 2015-03-13 13:38:58 +00:00
ocornut
110d96034b SliderFloat() fast-path when power=1.0f (no powf() calls) also makes code easier to read 2015-03-13 13:28:30 +00:00
ocornut
aaca73de15 Refactor SliderFloat() internals into a helper SliderFloatAsInputText() + some comments 2015-03-13 13:23:03 +00:00
ocornut
4d78c5c9ab Comments and reduced ImGuiTextEditState.InitialText[] to 3 KB (assuming average use case of UTF-8 uses 3 bytes charracters) 2015-03-13 13:15:01 +00:00
ocornut
ceb4da2038 Comments 2015-03-13 13:04:10 +00:00
ocornut
55093ea8fe Separator() logs itself as text 2015-03-13 12:44:04 +00:00
ocornut
153454a0fb Example console keeps focus on input box at all times 2015-03-13 12:28:23 +00:00
ocornut
1c1a55f6b1 Added IsRootWindowFocused(), IsRootWindowOrAnyChildFocused(). Renamed GetWindowIsFocused() to IsWindowFocused() 2015-03-13 12:25:43 +00:00
ocornut
e2734d23ef Child window don't take focus when they first appear (focus left to parent) 2015-03-13 11:16:11 +00:00
ocornut
0911526424 Added io.KeyAlt + support in examples apps 
Currently unused but supported by sample so that more people will have
it set up when menus needs them
 2015-03-13 09:49:38 +00:00
ocornut
58dc3f97c5 WIP marker in uppercase.. (#127) 2015-03-11 16:45:58 +00:00
ocornut
5d1c381509 Update version number, added IMGUI_VERSION, ImGui::GetVersion() (#127) 2015-03-11 16:44:54 +00:00
ocornut
4b1a18c2c9 Fixed more warnings from @bkaradzic 2015-03-09 18:36:03 +00:00
ocornut
dac9266f6f Fixed warnings 2015-03-09 18:26:48 +00:00
ocornut
378eee490b Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives 2015-03-09 18:06:39 +00:00
ocornut
d440a13b7e Version number 2015-03-09 17:30:22 +00:00
ocornut
91b4b8a0fc InputText() handles buffer limit correctly for multi-byte UTF-8 characters (fix #158) 
We now maintain the buffer len for both UTF-8 and wchar
 2015-03-08 20:21:19 +00:00
ocornut
6cd3ed58ce Fixed UTF-8 decoding errors leading into infnite loops (#158) 2015-03-08 17:55:56 +00:00
ocornut
0eeb6228b9 Default clipboard handlers for Windows handle UTF-8 (the glfw ones already did that) 2015-03-08 17:23:24 +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
Usagi Ito
c9bfd71e1a Fix the Japanese glyph range; include Punctuations 
ref. #156 https://github.com/ocornut/imgui/issues/156
 2015-03-08 22:23:52 +09: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
ocornut
e01500f046 Added comments on columns function; Added GetColumnIndex(), GetColumnsCount(), #154 2015-03-07 12:18:01 +00:00
ocornut
6db6c0c8c0 Collapse triangle uses text color (not border color) 2015-03-07 00:35:47 +00:00
ocornut
8dd3f854fe AA branch: fixed columns separators. 2015-03-07 00:32:52 +00:00
ocornut
470a8499fe AA branch: fixed input cursor. 2015-03-07 00:28:10 +00:00
ocornut
af1f41dc6a AA branch: disabled border shadow by default. 2015-03-07 00:26:53 +00:00
ocornut
f5c2f8c60d AA branch: fixed separators, borders, input cursor. - not really sure about this. 2015-03-07 00:24:21 +00:00
ocornut
cf1554ebb5 AA branch: fixed frame rounding clamping glitch. 2015-03-07 00:06:48 +00:00
ocornut
2b032004a9 AA branch: Fixed resize grip to scale better with non-default window rounding settings. 2015-03-07 00:01:02 +00:00
ocornut
d69df3065f AA primitives: using a single vector for storage and accessing via raw pointers. 2015-03-06 23:47:26 +00:00
ocornut
8ca3dc8e41 Merge: First pass on AA rendered primitives from https://github.com/memononen/imgui 2015-03-06 23:39:38 +00:00
ocornut
1f272785f1 ShowTestWindow() minor tweak 2015-03-06 22:43:42 +00:00
ocornut
4ab2db73e5 Fixed ListBox() label not included in declared size (fix #151), fixed ListBoxHeader() incorrect handling of SkipItems, Added Exemple 2015-03-06 22:40:21 +00:00
ocornut
eaab61f08b Fixed using IsItemHovered() after EndChild() (#151) 2015-03-06 22:05:01 +00:00
ocornut
9c486ce4f4 Minor tidying up (more consistently using 'label_size' as a variable name) 2015-03-06 21:58:12 +00:00
ocornut
bf88d6a329 Minor tweak 2015-03-06 21:52:48 +00:00
ocornut
be9fe9489c Examples: DirectX examples uses WM_KEYDOWN/WM_KEYUP 
Fixes pressing Enter in IME being caught by application right after
validating an IME input.
 2015-03-06 21:39:55 +00:00
ocornut
e269125c3a Windows: setup a default handler for ImeSetInputScreenPosFn so IME (Japanese/Chinese) inputs are positioned correctly. 
User need to set io.ImeWindowHandle
 2015-03-06 21:11:14 +00:00
ocornut
0ffd99d319 Font: fix for fallback character width. 2015-03-06 19:17:20 +00:00
ocornut
b361c44ef4 Handle double-width space (0x3000) in various places, for Japanese users. 2015-03-06 17:51:25 +00:00
ocornut
8691c5ca42 Version number + commented failing test case 2015-03-03 15:52:56 +00:00
ocornut
cfe6dac5a3 Fixed Combo() label not included in declared size (fix #149, relate to #145) 2015-03-02 16:04:36 +00:00
ocornut
f4458f7571 Version number 2015-03-02 10:10:46 +00:00
ocornut
0faf0e6948 FindWindowByName() comparing hashes. 2015-03-02 10:04:35 +00:00
Dale Kim
85c71170af Defined bool ImGui::GetWindowCollapsed(). 2015-02-28 14:47:59 -06:00
ocornut
f18febca11 window->RootWindow persist across frames. Fix calling SetWindowFocus(const char* name) on a child window (last fix for #147) 2015-02-28 10:29:00 +00:00
ocornut
4535644fcb Clicking on empty space in a child window set keyboard focus on the child window and move parent to front (#147) 2015-02-28 10:25:04 +00:00
ocornut
9b6fa29022 Clicking on a widget in a child window focus the parent window (#147) 
However SetWindowFocus() called on a child window prior to calling
Begin() on said child won;'t work yet.
 2015-02-28 09:54:14 +00:00
ocornut
6fecf90e32 Unused variables fixes. 2015-02-27 11:01:34 +00:00
ocornut
40b04a3701 Renamed ImGuiSetCondition_*** to ImGuiSetCond_*** and ImGuiCondition_FirstUseThisSession to ImGuiCond_Once 2015-02-27 09:51:11 +00:00
ocornut
2177b11682 Added SetNextTreeNodeOpened() with optional condition flag in replacement of OpenNextNode() 2015-02-27 09:38:22 +00:00
ocornut
d369e6b333 Fix 2015-02-27 09:13:23 +00:00
ocornut
ebe363c951 Added SetWindowPos(), SetWindowSize(), SetWindowCollaposed() given a wnidow name. 2015-02-27 09:07:25 +00:00
ocornut
6d89285f59 Added SetWindowFocus(), SetWindowFocus(const char*), SetNextWindowFocus() (#146) 2015-02-27 09:01:12 +00:00
ocornut
037ec09ffe Fixed unpackaging of Japanese glyphs ranges 2015-02-26 19:06:54 +00:00
ocornut
168a811d11 Added codepoint U+3000 (Ideographic space) and Katakana Phonetic Extensions to GetGlyphRangesChinese/GetGlyphRangesJapanese 2015-02-26 19:00:39 +00:00
ocornut
441679d9d4 Fixed GetGlyphRangesJapanese() actually missing Katakanas glyphs. 2015-02-26 18:51:51 +00:00
ocornut
8bcf2f25f2 Fixed IsItemHovered() behaving differently on Combo() (pointed out by #145) 2015-02-25 12:28:28 +00:00
ocornut
3220471237 ColumnOffsets honor SetStateStorage() modifications 2015-02-24 23:29:15 +00:00
ocornut
c2a68bb413 Made some internal parameters names more consistent 2015-02-23 21:02:04 +00:00
ocornut
c51be42f28 Added Bullet() + usage examples 2015-02-23 20:59:22 +00:00
ocornut
0df8ff6931 Version number 2015-02-23 20:52:33 +00:00
Dale Kim
72d10d3baa Fix SetColumnOffset() subtracting a bool value instead of scrollbar width. 2015-02-23 13:36:40 -06:00
ocornut
e022e5cff6 Version number 1.33 2015-02-22 18:16:25 +00:00
ocornut
cb3c1da77a GetColumnOffset() / SetColumnOffset() fixes. (cf #125) 
Actually ignore window padding, and don't subtract
window->DC.ColumnsStartX like older version did.
 2015-02-22 17:02:17 +00:00
ocornut
18a9c799aa Tweaking Columns() examples. 2015-02-22 16:45:55 +00:00
ocornut
358d41ba8e GetColumnOffset() / SetColumnOffset() takes account of window padding properly (cf. #125) 2015-02-22 16:27:34 +00:00
ocornut
b9457a2c02 Reworked Columns() examples. 2015-02-22 16:26:37 +00:00
ocornut
5b59f228ed Separator() within column correctly vertical offset all columns content (pointed out in #125) 2015-02-22 14:43:52 +00:00
ocornut
2e9dea0619 Removed extraneous (1,1) padding on child window (pointed out in #125) 2015-02-22 14:34:34 +00:00
ocornut
bab81318a9 Comments and changed ImVec2 parameters to const ImVec2& 2015-02-22 12:38:46 +00:00
ocornut
4229b7e60b Fix hovering of child window extending past their parent not taking account of parent clipping rectangle (Fix #137) 2015-02-22 12:05:38 +00:00
ocornut
835a46effb Comments 2015-02-21 16:50:34 +00:00
ocornut
00e281bef1 Version number 2015-02-21 16:39:21 +00:00
ocornut
0a1e67a787 InputText: cursor/selection/undo stack persist when using other widgets and getting back to same (#134) 
Using SetKeyboardFocusHere() in particular on last used text edit revive
the cursor/selection.
 2015-02-21 16:30:40 +00:00
ocornut
242a52abba InputText: minor tidying up. 2015-02-21 16:05:59 +00:00
ocornut
2f9ef13be3 Comments 2015-02-21 13:36:24 +00:00
ocornut
185744e697 Having a InputText() active doesn't steal mouse inputs (relate to #134) 2015-02-21 12:49:51 +00:00
ocornut
87a3522eb2 Clearing ImGuiState, may switch back to memset(0) but that would put a requirement on user defined ImVector<> to be zero-fill compat 2015-02-21 11:49:12 +00:00
ocornut
4deeaea93c BeginChild() return a bool analoguous to Begin(). if true you can skip submitting content. 2015-02-21 10:30:05 +00:00
ocornut
8f75cffc09 Columns: doesn't incorrectly bail out when SkipItems is set (fix #136) 2015-02-21 10:27:13 +00:00
ocornut
0e159aa22e BeginChild() variant goes after the main one 2015-02-21 10:10:21 +00:00
ocornut
2ae0e667d0 Child window explicitly inherit collapse state from parent. 2015-02-21 10:02:32 +00:00
ocornut
f2752584e2 Added IsAnyItemActive() 2015-02-18 17:17:06 +00:00
ocornut
c1f20f03c5 ImGuiTextFilter() can take a default filter string 2015-02-15 13:50:04 +00:00
ocornut
d58ded3acb Sliders: value is clipped inside the frame when resizing sliders to be small. 2015-02-13 10:37:03 +00:00
ocornut
9542f52182 InputText: size for allowed input size smaller than necessary by 1 byte. 2015-02-13 09:39:50 +00:00
ocornut
1eef869669 Fix ImFont::BuildLookupTable() potential dangling pointer dereference (fix #131) 2015-02-13 08:56:06 +00:00
ocornut
941ef993d9 ImGuITextFilter::Draw() use regular width call. 2015-02-12 19:34:14 +00:00
ocornut
dbdbaec3eb Version number + comment 2015-02-11 18:34:55 +00:00
ocornut
cb0a4db048 Calculate frame-rate for the user, as a purely luxurious feature 
..and to reduce sample code size a little.
 2015-02-11 18:28:17 +00:00
ocornut
d65e051a07 Minor formatting tweaks, comments 2015-02-11 18:14:39 +00:00
ocornut
a597664672 Added ImGuiInputTextFlags_CharsNoBlank stock filter. Tweak examples. 2015-02-11 18:01:32 +00:00
ocornut
2df4735904 ImGuiInputTextFlags_CallbackCharFilter can return 1 to filter character 2015-02-11 17:55:26 +00:00
ocornut
b73484a66b Added ImGuiInputTextFlags_CharsUppercase stock filter 2015-02-11 17:46:16 +00:00
ocornut
9473cd491e InputText(): added ImGuiInputTextFlags_CallbackCharFilter system for filtering/replacement. Callback now passed an "EventFlag" parameter. 2015-02-11 17:39:13 +00:00
ocornut
183a27fd70 CalcTextSize*() more optimisation, fast-path for ascii. 2015-02-11 12:31:04 +00:00
ocornut
ea94835834 CalcTextSize*() tweaks. ImTextCharFromUtf8() return 1 for a zero character now. 2015-02-11 12:23:38 +00:00
ocornut
1da8a52ce7 CalcTextSize*() functions which are often speed bottleneck for large contents are about 25% faster. 
Caching character advance contiguously, pulled inline, no int->float
conversion.
 2015-02-11 12:10:45 +00:00
ocornut
c73d9cfebb Columns offsets cached to avoid repeated binary search. 2015-02-11 11:50:24 +00:00
ocornut
6347179bb0 Added ListBox() (#129) 
Along with ListBoxHeader(), ListBoxFooter() helpers.
 2015-02-11 00:21:27 +00:00
ocornut
16925525c6 Selectable: fixed text clipping. 2015-02-10 22:56:28 +00:00
ocornut
c26af284db Tweaks. Combo default height_in_items is -1 at compilation time to match incoming ListSelect() behavior 2015-02-10 22:48:46 +00:00
ocornut
801ed2c472 Allow passing -0.01f to PushItemWidth() for a perfect right-side alignment + fix CalcItemWidth() 2015-02-10 21:42:21 +00:00
ocornut
e7f51172c1 BeginChildFrame() / EndChildFrame() helpers. 2015-02-10 21:21:23 +00:00
ocornut
1e9f6cce7f PushItemWidth() can take negative value to right-align items. Renamed GetItemWidth() to CalcItemWidth() 2015-02-10 21:07:26 +00:00
ocornut
5d31430785 Combo() uses Selectable() 2015-02-10 19:51:52 +00:00
ocornut
e5752f54b0 Selectable() variant: fixed missed return value 2015-02-10 19:47:35 +00:00
ocornut
8532da3f52 Added BeginChild() variant that takes an ImGuiID 2015-02-10 19:12:48 +00:00
ocornut
c6d42b1a54 Added Selectable() building block for various list boxes, combo boxes 2015-02-10 19:09:37 +00:00
ocornut
220d920581 Internal ButtonBehaviour() supports a pressed_on_click mode (unused yet) + Renamed internal Combo*getters to Items*getters 2015-02-10 17:45:45 +00:00
ocornut
46dfbb5fa8 Tweak default ImGuiCol_HeaderActive to be less bright 2015-02-10 17:43:58 +00:00
ocornut
da2f5d9c48 Added ImGuiCol_ChildWindowBg, ImGuiStyleVar_ChildWindowRounding for completeness and flexibility 
Upcoming features using it.
 2015-02-10 13:00:22 +00:00
ocornut
4cb236fe46 ShowTestWindow() demonstrate tree nodes within columns. 2015-02-10 12:37:52 +00:00
ocornut
8e8cb7de3f Fixed title bar text clipping issue (fix #128) 
+ Update version number
 2015-02-09 20:32:00 +00:00
ocornut
734cf47e71 Version number 2015-02-08 17:26:24 +00:00
ocornut
f387c3f22f Combo box always appear above other child windows of a same parent 2015-02-08 17:21:51 +00:00
ocornut
b5e7648e24 Title bar text uses cpu-clipping + comments 2015-02-08 16:39:34 +00:00
ocornut
f84166dda9 Use cpu-side clipping instead of a new draw call for isolated label-clipped-by-frame cases. 2015-02-08 16:32:51 +00:00
ocornut
cc340e0b81 Split RenderText into RenderTextWrapped for internal uses 
Different text functions with different features (usually orthogonal set
of features)
 2015-02-08 15:57:06 +00:00
ocornut
b8cd080cdb LabelText: value is properly clipped (fixes #23) 2015-02-08 15:46:23 +00:00
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
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
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
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
6777145853 InputText: Filtering private Unicode range 0xE000-0xF8FF seems like glfw on OSX uses those? 2015-02-01 14:08:37 +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
Jim Tilander
98e71afa72 Removed the dependency on realloc functionality 2015-01-31 16:17:39 -08: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
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
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
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
79042a3a3c GetVoidPtr() functions like GetInt, GetFloat. Renamed GetIntPtr/GetFloatPtr to GetIntRef/GetFloatRef 2015-01-29 10:22:32 +01:00
Daniel Collin
c9c41c3874 Added Set/GetVoidPtr in ImGuiStorage 2015-01-28 21:31:22 +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
b0eac255ca Warning fixes for 64-bit architectures 2015-01-20 01:01:25 +01:00
ocornut
56ac857cac Added stub for obsolete GetDefaultFontData() to help the user upgrading 2015-01-18 15:12:41 +00:00
ocornut
7e2305eb36 Comments 2015-01-18 12:22:17 +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
8386e4fb7e Fix handling of NULL GlyphRanges. Asserting on AddFontFromFileTTF() failure. 2015-01-18 11:36:23 +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
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
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
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
ocornut
3a20671802 Fixed logging to clipboard on architectures where va_list are modified by vsnprintf (fixed #112) 2015-01-14 13:01:53 +00:00
ocornut
5322224881 Warning fixes for llvm windows 64-bits 2015-01-13 23:19:11 +00:00
ocornut
f0b493c217 Fixed style.WindowMinSize not honored properly. 2015-01-13 23:05:20 +00:00
ocornut
f061884dea Typos and comments 2015-01-11 22:22:46 +00:00
ocornut
0f89e06152 Fixed temporary glyph rectangle allocation using size much too big. 2015-01-11 22:03:03 +00:00
ocornut
e5d0d8334f Tweak default texture width for large amount of characters. 2015-01-11 21:55:21 +00:00
ocornut
d27b295f4c Documentation on new font / texture get api 2015-01-11 21:24:12 +00:00
ocornut
0f4d74d614 ImFont::GetTextureData API allow to retrieve 8/32 bits data + lazily load defaults font 
Examples: OpenGL3 and DirectX11 back to using 32-bits texture solely for
ease of integration.
 2015-01-11 21:06:57 +00:00
ocornut
241e8086fa Mde it optional to new() io.Font - however it stills needs to be loaded. 2015-01-11 18:27:05 +00:00
ocornut
a09f426b89 TAB to spaces 2015-01-11 17:56:43 +00:00
ocornut
40f7b67ef1 ImDrawList::AddText() allows changing font 2015-01-11 16:46:39 +00:00
ocornut
cc79b85c28 Added first-pass of Image() based on #73 + demo 2015-01-11 16:30:39 +00:00
ocornut
c1fe6fe14d Fixed GetStyleColName() not matching the enum strings for 3 values (#111) 2015-01-09 17:19:24 +00:00
ocornut
5dff478dc0 Build fix for GCC/Clang, cannot foward declare a static array? 2015-01-09 09:00:53 +00:00
ocornut
2757e3573a Comments 2015-01-08 23:53:07 +00:00
ocornut
b3a208901a Loading TTF file with stb_truetype. Broke setup API slightly. Font baked, packed with space for custom data. Embeds compressed ProggyClean. 2015-01-08 23:35:01 +00:00
ocornut
b0ea57e518 Version number 2015-01-07 19:07:43 +00:00
ocornut
4260195159 Revert "Reexported proggy_clean_13 in a 256x64 texture (instead of 256x128) and documented exact export parameters" 
Correct but cause problems because many people don't have 1 BPP PNG loaders

This reverts commit 98a38e24ab.
 2015-01-07 18:59:44 +00:00
ocornut
26fdf1655c Fixed leak on shutdown (fixes #110) + possible uninitialized member. 2015-01-07 14:55:35 +00:00
Mikko Mononen
fdc8c0722f Compile fixes 2015-01-06 19:24:57 +02:00
Mikko Mononen
91684a428b Merge upstream 2015-01-06 19:15:41 +02:00
Mikko Mononen
d9757bb583 First pass on AA rendered primitives 2015-01-06 19:05:24 +02:00
ocornut
98a38e24ab Reexported proggy_clean_13 in a 256x64 texture (instead of 256x128) and documented exact export parameters 2015-01-05 11:13:02 +00:00
ocornut
0505995193 Very minor code/comments tweaks. 2015-01-04 22:29:53 +00:00
ocornut
4905ec46f1 Fixed hovering of child windows / combo boxes that extend beyond the root window limits. 2015-01-04 22:07:37 +00:00
ocornut
3fe669f547 Failure in LogToFile() treated at an error (assert) in the absence of another type of error handling. 2015-01-04 21:37:49 +00:00
ocornut
22c1d7eded Renamed some color enums 2015-01-04 19:37:24 +00:00
ocornut
39373b563b Checkbox and Radio buttons activate on click-release to be consistent with other widgets and most UI 2015-01-04 19:23:36 +00:00
ocornut
97d34271f8 Fix clipboard pasting into an InputText box not filtering the characters according to input box semantic (number, etc.) 2015-01-04 18:47:08 +00:00
ocornut
a5f4108781 Activating widget bring parent window to front 2015-01-04 18:36:33 +00:00
ocornut
3674d30e90 Fixed clicking on Combo box label. 2015-01-04 18:32:15 +00:00
ocornut
2268b098e0 Avoid marking settings as dirty when window is marked unsaved + minor FocusWindow() optimisation 2015-01-04 18:23:30 +00:00
ocornut
4bccc06933 Dragging outside area of a widget while it is active doesn't trigger hover on other widgets. 2015-01-04 18:12:30 +00:00
ocornut
ee49c2288d Todo items. 2015-01-03 17:38:10 +00:00
ocornut
34664dc28c InputText() consume input characters immediately (fixes #105) 2015-01-03 17:37:39 +00:00
ocornut
12225abfe2 Version number (fix) 2014-12-31 10:38:36 +00:00
ocornut
505bd1a66d Fixed text input filtering for character in the 128-255 range. 2014-12-31 09:49:53 +00:00
ocornut
f8c58fe328 Fix for Clang 2014-12-30 16:55:32 +00:00
ocornut
74ab555558 Examples: Console:: added support for History callbacks + cleanup to be self contained. 2014-12-30 16:49:39 +00:00
ocornut
3b028c7ebf Fixed InputInt() InputFloat() label not declaring their width, breaking SameLine (bug #100) 
+ shallow cleanups
 2014-12-30 15:38:28 +00:00
ocornut
2d111ccb55 crc32 on strings is performed in one pass - removed the strlen() call. 2014-12-30 15:18:21 +00:00
ocornut
209be54e49 Version number 2014-12-30 12:21:57 +00:00
ocornut
aa750d538d Style editor: added an Output button to output colors to clipboard/tty 2014-12-30 12:08:33 +00:00
ocornut
929f127d06 Added SliderInt2(), SliderInt3(), SliderInt4() for consistency 2014-12-30 11:54:04 +00:00
ocornut
60b4389ac1 Empty label consistently remove the inner-padding normally preceeding the label. 2014-12-30 11:41:46 +00:00
ocornut
a950df6655 Tightening default style (saving -2 pixels on each axis per widget) 2014-12-30 10:00:00 +00:00
ocornut
409b1ac6b5 Log output \r\n under Windows so files are readable with Notepad 2014-12-29 20:41:27 +00:00
ocornut
036a153cf4 Log depth padding relative to start depth. Tree node and headers looking better when logged to text. Added LogText(). 2014-12-29 20:18:52 +00:00
ocornut
886d954e3d GetStyleColorName -> GetStyleColName for consistency with type name. Removed ImGuiStyleVar_ColumnsMinSpacing 2014-12-29 19:56:01 +00:00
ocornut
39952d2362 Renamed GetTreeStateStorage() to GetStateStorage(). Columns storing floats instead of fixed point integers 2014-12-29 18:17:54 +00:00
ocornut
1b25fa8169 Added LogFinish() to stop logging at an arbitrary point. 2014-12-29 18:13:41 +00:00
ocornut
0796dc0dc1 Minor fix for cases of malformed .ini file (zero-terminating text file like it was before previous commit). 2014-12-29 18:05:22 +00:00
ocornut
8994f2f1e4 Cleanup. Removed unnecessary calls to sqrtf(). Factoring bits into ImLoadFileToMemory(). Added index of static helpers. 2014-12-29 11:23:03 +00:00
ocornut
e2fbbe0274 Factoring bits out of Begin() into a private CreateNewWindow() funciton 
(Hopefully to ease a bit the merging work for ProDBG)
 2014-12-28 17:54:02 +00:00
ocornut
5b7ed5432e CalcTextSize() default third parameter to false because it almost never makes sense to use it from the outside (may obsolete it) 2014-12-28 16:17:08 +00:00
ocornut
bf3212c681 Taking notes of issues/todo 2014-12-28 16:09:19 +00:00
ocornut
34728394ec Fixed clipped ImGui::Combo not registering its size properly (was flickering when scrolling with combo on the edge of clipping region) 2014-12-26 12:38:13 +00:00
ocornut
90351298d1 Renamed second parameter to Begin() to 'bool* p_opened' to be more self-explanatory. Added more comments on the use of Begin(). 2014-12-22 13:29:39 +00:00
ocornut
69f3d67d18 Preserve windows position on zero-sized display (minimized). 2014-12-22 02:14:31 +00:00
ocornut
ac29859f70 Support zero-sized display, now sets default as -1,-1 and assert if display size is negative. 2014-12-22 01:45:13 +00:00
ocornut
a3af51fd4e Added ImGuiStyleVar_WindowRounding enum for PushStyleVar() API 2014-12-19 12:56:00 +00:00
omar
7e868e2842 Cleanup todo list, removed 3 done items + added 1 new 2014-12-11 10:12:52 +00:00
omar
0056ccce26 Version number 2014-12-10 23:40:25 +00:00
omar
e9e0e36f98 New and better Set[Next]Window(Pos|Size|Collapsed) API. 
Removed rarely useful SetNewWindowDefaultPos() in favor of new API.
 2014-12-10 19:22:30 +00:00
omar
3399890a84 Added ImGuiWindowFlags_NoSavedSettings flag + Fixed overlay example app. 2014-12-10 17:13:45 +00:00
omar
bdb2344db0 ImGuiStorage helper can store float + added functions to get pointer to data. Exposed ImGui::GetId() - may be misleading? 2014-12-08 17:14:54 +00:00
Daniel Collin
317dab5269 Clang warning fixes 2014-12-06 13:49:46 +01:00
ocornut
e43cd6e97f Added IMGUI_INCLUDE_IMGUI_USER_H 2014-12-05 23:09:43 +00:00
omar
a5cc2e4161 Fixed InputInt() writing to output when it doesn't need to, which break with large int due to int<>float conversions. Added todo note. 2014-12-05 12:34:14 +00:00
omar
d133831909 In-code FAQ: added comment about reading WantCaptureMouse / WantCaptureKeyboard 2014-12-04 11:42:13 +00:00
omar
860cf578f5 Added ImGuiWindowFlags_NoScrollWithMouse flag. 
ButtonBehaviour test hovering of CurrentRootWindow (vs CurrentWindow, different for child-windows). This is intentionally meant to fix grabbing the lower-right resize grip when lower-right corner has a child-window, but may be the overall right-er test. Testing out.
 2014-12-03 18:17:10 +00:00
ocornut
7f804d3d64 Tab->Spaces :( visual studio can't even be trusted for that, oh thanks. 2014-11-30 16:56:35 +00:00
ocornut
0f29cd7a14 Removed Microsoft IME handler in examples, too confusing. Moved to imgui.cpp instruction block. 2014-11-30 15:54:58 +00:00
ocornut
a5a84a9b69 Tab->Spaces :( 2014-11-30 15:53:47 +00:00
ocornut
2e576de9ca Fix comments 2014-11-30 15:00:07 +00:00
ocornut
38164a410d ImStrnicmp tweak 2014-11-30 12:31:43 +00:00
omar
31654958f9 Merge pull request #92 from memononen/master 
Smoother mouse wheel scrolling
 2014-11-30 12:25:21 +00:00
ocornut
a31e44b99a Fixed Clang -Weverything warnings + TODO list entries 2014-11-30 12:21:50 +00:00
Mikko Mononen
eb789c0288 Smoother scrolling 
- changed IO.MouseWheel to float, allows smoother scrolling
 2014-11-30 12:20:25 +02:00
ocornut
e9aead09cb Remove unneeded extra parameter from ImFont::FindGlyph() 2014-11-29 00:04:05 +00:00
ocornut
e4a79e9fc8 Moved IO.Font*** options to inside the IO.Font-> structure.. Added IO.FontGlobalScale setting (vs Font->Scale) 2014-11-29 00:02:46 +00:00
ocornut
311a2f8328 New version of IMGUI_ONCE_UPON_A_FRAME helper macro 2014-11-28 23:08:45 +00:00
ocornut
df2ad5e899 Renamed ImBitmapFont -> ImFont, removed abstraction-pretend typedef 2014-11-28 22:38:41 +00:00
ocornut
07a6ba8aaf Merge branch 'master' of https://github.com/ocornut/imgui 2014-11-28 22:29:07 +00:00
ocornut
16d6561aba Increased visibility of check box and radio button with smaller size. + comments 2014-11-28 21:53:31 +00:00
omar
abe45e9976 Moved API Breaking Changes section of the documentation above the programmer's FAQ. 2014-11-26 22:27:48 +00:00
omar
c0999495e7 Fixed move-by-word in InputText() - broken 2 days ago, sorry. stb_ expect a define. 2014-11-26 22:19:46 +00:00
omar
b9118750ae Removed IMGUI_ONCE_UPON_A_FRAME in favor of ImGuiOnceUponAFrame which is supported by all compilers 2014-11-26 22:16:38 +00:00
ocornut
ec4b510775 Minor tidying & comments 2014-11-24 10:02:39 +00:00
ocornut
1484799b18 Console example: fixing losing text selection when using TAB completion with no match 2014-11-23 23:50:23 +00:00
ocornut
895f93f694 Remove unused variables 2014-11-23 23:36:54 +00:00
ocornut
49defcf083 InputText support for completion/history/custom callback + added fancy completion example in the console demo app 
Unfortunately quite messy because of the UTF-8 <> wchar confusion going
around. Not well tested for UTF-8 compliance with non-Ascii characters.
 2014-11-23 23:35:26 +00:00
omar
e78c47961e Not word-wrapping on apostrophes 2014-11-21 16:35:35 +00:00
omar
8c4fcf1359 Added ImGuiWindowFlags_AlwaysAutoResize + example app. Calling SetWindowSize(0,0) force an autofit without zero-sizing first. 2014-11-21 16:29:56 +00:00
omar
2322318cac PopStyleVar() fix. OOPS 2014-11-21 14:19:26 +00:00
omar
5f8175abaa Version number 2014-11-21 13:40:38 +00:00
omar
075fe0220e MouseWheel input is normalized 2014-11-21 13:24:57 +00:00
omar
cf037b4769 PushStyleColor/PushStyleVar can be used outside the scope of a window. Added 'count' parameter to PopStyleColor/PopStyleVar 2014-11-21 13:23:22 +00:00
ocornut
3572b04c69 ShowTestWindow: fixed example app from not displaying when header is collaposed. 2014-11-20 11:54:13 +00:00
ocornut
fd8752df8d Style editor: colors list inside a scrolling region 2014-11-20 11:33:40 +00:00
ocornut
f1dcd72e9f General fixes of Columns() api. User has more flexibility in the way to fill cells. 2014-11-20 11:31:55 +00:00
ocornut
2aee4419e3 Fixed compatibility with std::vector if user decide to #define ImVector 2014-11-20 08:15:21 +00:00
ocornut
9f2545e6bb Fixed comment 2014-11-18 10:01:34 +00:00
ocornut
f3bd033b6d More fixes for ultra pedantic Clang -Weverything 2014-11-18 09:55:31 +00:00
ocornut
b15532345b Using sqrtf, cosf, sinf. Made STB_TEXTEDIT_ implemtations static. Tweaks. 2014-11-18 07:51:55 +00:00
Daniel Collin
428c4d4ece Fixed Clang warnings 2014-11-17 20:35:58 +01:00
omar
172ff0a262 Commenting unnecessary strlen calls that could be removed for speedup 2014-11-17 02:27:26 +09:00
ocornut
3f85fe2fe7 Cleanup and TODO list items 2014-11-15 12:00:35 +00:00
ocornut
447cc88e04 Fixed unaligned memory access - fix font loading when building on Emscripten 2014-11-15 11:41:03 +00:00
omar
9c707b6d8f Added assert to catch font data loading failure in a location that's easier to understand 2014-11-14 11:22:35 +09:00
omar
9b5493d1d9 Added assert to catch users using Begin/End without a first NewFrame 2014-11-14 11:17:59 +09:00
omar
8a65d97bf0 Warning fixes (now testing with Clang) 2014-11-12 16:56:42 +09:00
Yaroslav Bunyak
7961c53145 Fix namespaces for Value() and Color() functions. 2014-11-12 01:36:34 +02:00
omar
d3bc92a674 Added INDEX to top of imgui.cpp 
Explicit namespace prefix on all ImGui:: functions.
Fixed some typos.
 2014-11-10 10:29:01 +09:00
omar
c97636aef4 Fixed lines clockwiseness to be consistent with other primitives. 2014-11-10 09:36:01 +09:00
omar
ee3355fe8e Version number 2014-11-07 17:43:00 +09:00
omar
1e30400f80 Added PushStyleVar(),PopStyleVar() helpers. 
BeginChild() allows to specify negative sizes to specify "use remaining minus xx".
Added a simple example console into the demo window.
 2014-11-07 17:22:38 +09:00
omar
3a64c77826 Renamed IsHovered() to IsItemHovered() 2014-11-07 15:49:14 +09:00
omar
6c192f3221 Added GetContentRegionMax() supporting columns. Some bug fixes with using columns. 2014-11-07 15:17:04 +09:00
omar
78645a7dba Added word-wrapping API TextWrapped(), PushTextWrapPos(), PopTextWrapPos() 
Added word-wrapping sample in the test window.
Added IsItemFocused() to tell if last widget is being focused for keyboard input.
 2014-11-07 14:45:56 +09:00
ocornut
74363c5a43 Fixed column using a "funny scale factor" (non power of two) #67 2014-10-26 21:33:34 +00:00
ocornut
0b10cf4bd7 Fixed some typos in comments 2014-10-26 21:31:34 +00:00
ocornut
3d84858755 Made with the NoResize flag can still use auto-fitting. Added SetWindowSize(). 2014-10-26 20:07:15 +00:00
ocornut
fad5e45d2c Minor tweaks 2014-10-26 19:56:57 +00:00
Jarrett Billingsley
85eee4a4c5 Added overloads of ImGui::PlotLines and ImGui::PlotHistogram which take a value getter function instead of raw value data, and changed the implementation of the original overloads to use this new implementation. 2014-10-26 12:25:00 -07:00
ocornut
f768579377 GCC warning fix 2014-10-26 18:57:19 +00:00
ocornut
e6eafd6fa8 Fixed warnings for GCC -Wpedantic 2014-10-26 15:08:28 +00:00
omar
1037bacc4b Version number 2014-10-25 11:15:28 +01:00
omar
af37fb1ee7 Added GetWindowFont(), GetWindowFontSize() + comments following user's feedback 2014-10-25 11:00:24 +01:00
ocornut
9f05a2bb16 Fixed unlikely buffer overrun in InputCharacters (thanks Daniel Collin) 2014-10-07 12:15:59 +01:00
ocornut
48a944813c Moved UserData 2014-10-05 09:11:02 +01:00
ocornut
1d9a4748de Added a UserData void *pointer so that the callback functions can access user state 
"Just in case a project has adverse reactions to adding globals or
statics in their own code."
 2014-10-05 09:08:57 +01:00
Sean Middleditch
bebadb9012 64-bit fixes 
`int` values are not the same thing as `size_t` nor `ptrdiff_t`. Convert incorrect uses of `int` to more appropriate types.

Fixes warnings for 64-bit compilations.
 2014-10-03 20:24:04 -07:00
ocornut
530e746daa Renamed IMGUI_INCLUDE_IMGUI_USER_CPP to IMGUI_INCLUDE_IMGUI_USER_INL (more IDE friendly) 2014-10-02 11:56:40 +01:00
ocornut
ce481ec702 SetKeyboardFocusHere() allow for an offset to access sub components + comments 2014-09-30 12:31:35 +01:00
ocornut
f1ea630dd0 SetKeyboardFocusHere() sets focus on next widget instead of previous + works on tabbing-disabled widgets 2014-09-30 12:22:58 +01:00
ocornut
ffc8264e9d Added SetKeyboardFocusHere() to set focus from code. Fixed tabbing through tab-disabled fields. 2014-09-30 11:57:37 +01:00
ocornut
0fa3d6e25f Version number and font documentation 2014-09-26 01:20:56 +01:00
ocornut
f898e658bb Added IO.FontFallbackGlyph (default to '?') + UTF-8 test in demo window 2014-09-26 01:06:27 +01:00
ocornut
b6ac371496 Warning fix 2014-09-25 20:55:48 +01:00
ocornut
81b9480413 Speculative warning fixes 2014-09-25 20:08:08 +01:00
ocornut
b86505bf2f Support for international text input in UTF-8. Added ImeSetInputScreenPosFn(). Removed text_end parameter from SetClipboardTextF 2014-09-25 14:51:06 +01:00
ocornut
d35ceb793e OpenGL example: added commented code to load custom font from filesystem 2014-09-25 11:35:23 +01:00
ocornut
51bbe1d961 Handle UTF-8 decoding for rendering and text size calculation 2014-09-25 11:29:59 +01:00
ocornut
a1162ac001 Tab to spaces 2014-09-24 20:39:39 +01:00
ocornut
618a42acf8 Renamed section in documentation 2014-09-24 19:35:34 +01:00
ocornut
3cd1b8a37b Update version number in sources 2014-09-24 19:34:03 +01:00
ocornut
746951691a Added va_list variations of all functions taking ... parameters (from Andrea Pessino) 2014-09-24 19:27:29 +01:00
ocornut
fec4232c79 Moved IM_MALLOC/IM_FREE/etc. to IO structure members one can set at runtime. 2014-09-24 18:01:07 +01:00
ocornut
85672fec2e Added IsPosHoveringAnyWindow() 2014-09-24 15:49:15 +01:00
ocornut
d5ed586d70 Added IsMouseHoveringWindow(), IsMouseHoveringAnyWindow() 2014-09-24 15:38:29 +01:00
ocornut
6e039c8b7d Doc formatting + adding 'API changes' section 2014-09-24 14:06:34 +01:00
ocornut
05a42ba3a6 Added IO.FontBaseScale for global rescale. Renamed SetFontScale to SetWindowFontScale 2014-09-24 14:03:42 +01:00
ocornut
24028911e3 Added version number in sources 2014-09-10 12:26:12 +01:00
ocornut
3fd68c3a31 Fixed file-descriptor leak if ImBitmapFont::LoadFromFile() calls to seek/tell fails. 2014-09-10 12:21:38 +01:00
ocornut
2e85dce1ee Added #define IMGUI_INCLUDE_IMGUI_USER_CPP to optionally include imgui_user.cpp 2014-09-10 11:22:01 +01:00
ocornut
62d233aaab Added extra_flags parameters to InputInt(), InputFloat(). Used in example code. Commented out broken ImGuiInputTextFlags_AlignCenter. 2014-09-08 16:50:09 +01:00
Thomas Buck
7439df0ba1 Added ImGuiInputTextFlags_EnterReturnsTrue 2014-09-08 15:48:39 +02:00
ocornut
ad42787543 Made radio button render ascii when logged into tty/file/clipboard 2014-09-02 14:36:03 +01:00
ocornut
91059da1a5 Added more comments in the code. 2014-09-02 14:35:06 +01:00
ocornut
c07ab1b56a Minor tweaks to "Memory override" pull request 2014-08-31 12:02:22 +01:00
Sepehr Taghdisian
25080d53e5 Memory override #3 2014-08-31 14:58:21 +04:30
ocornut
43448d9c89 Added FAQ/comments 2014-08-31 08:23:55 +01:00
ocornut
3b339efeb2 Added IO.FontYOffset. Added asserts. 2014-08-30 20:02:10 +01:00
ocornut
8fc50f5ed3 Remove IO.FontHeight, cached automatically. Added assertions. 2014-08-30 18:43:26 +01:00
ocornut
dd5d251273 Added SetCursorPosX, SetCursorPosY shortcuts 2014-08-29 13:36:31 +01:00
ocornut
2fb63b6068 Checkbox() return true when pressed 2014-08-28 17:32:03 +01:00
ocornut
7adad71042 Moved IMGUI_FONT_TEX_UV_FOR_WHITE define to a variable so font can be changed at runtime 2014-08-28 14:53:41 +01:00
ocornut
88c33ecc29 Fixes to allow clean 1-pixel thick lines in more use cases. PixelCenterOffset not the same as previously! 2014-08-28 14:52:10 +01:00
ocornut
1f63e01cc6 Minor fixes to scrollbar rendering, close button and made checkbox/radio button padding more consistent. 2014-08-27 22:16:55 +01:00
ocornut
bd26de0628 Collapse triangle don't have a shadow unless borders are enabled. 
Fixed cross that appears when hovering window close button to be perfectly 45 degrees.
 2014-08-27 17:54:11 +01:00
ocornut
5a9639b423 Fixed collapsing header border (if borders are enabled) being off the clip rectangle. 
Tweak demo window.
 2014-08-27 11:38:26 +01:00
ocornut
80dd1e1065 Added comments 2014-08-26 18:27:10 +01:00
ocornut
5f6b261c9b Fixed uninitialised fields in ImBitmapFont (were unused when uninitialised, but still dodgy) 2014-08-26 18:14:04 +01:00
ocornut
681ac5f777 Fixed size/padding of slider grab box for vertical symetry (was 1 pixel too high) 2014-08-26 16:56:20 +01:00
Martin Ettl
addfa75eb0 Do not update a variable, which is not used. 2014-08-24 07:32:27 +02:00
ocornut
d2b43f31e3 Updated URL to new ProggyFonts site 2014-08-25 17:27:42 +01:00
ocornut
d17a586738 Fixed ImGuiTextFilter triming of leading/trailing blanks. Documented "Filtering" section of demo better. 2014-08-25 17:19:04 +01:00
Martin Ettl
882072cf30 Fixed resource leaks 2014-08-24 03:51:00 +02:00
ocornut
6062d18cf9 Added basic sizes edition in the style editor 2014-08-20 17:42:53 +01:00
ocornut
6dd2b13220 Merge branch 'Dadeos-compilation_warnings' 2014-08-20 10:41:06 +01:00
ocornut
5864c45fe3 Fix type conversion compiler warnings (from dadeos) 2014-08-20 10:40:31 +01:00
ocornut
4bc3642bdb Todo list 2014-08-20 10:19:05 +01:00
ocornut
a3f32381c4 Fix mismatched static declaration warning 2014-08-19 12:51:13 +01:00
ocornut
67f17a644c Converted all Tabs to Spaces 
Argh
 2014-08-19 12:45:34 +01:00
ocornut
e807d97089 Exposed CalcTextSize(), GetCursorScreenPos() for more advanced fiddling 2014-08-19 12:39:30 +01:00
ocornut
23d156908d Added an assertion 2014-08-19 12:27:34 +01:00
ocornut
42d4b4be6a Converted all Tabs to Spaces (git diff -w shows an empty diff) 2014-08-19 12:09:13 +01:00
ocornut
efc473df98 Todo list 2014-08-18 19:13:18 +01:00
ocornut
bbda899801 Removed unused parameter in demo window code 2014-08-18 19:10:00 +01:00
ocornut
a17885f470 Fixed tooltip size (broken earlier today) + added todo items 2014-08-18 18:43:39 +01:00
ocornut
7de89e0da3 Removing line from Todo list 2014-08-18 14:31:47 +01:00
ocornut
7c61822d26 Skip most logic is alpha is 0.0, Begin() also return false to allow user to early out 2014-08-18 14:30:33 +01:00
ocornut
ca027e1754 Skip rendering if alpha is 0.0 2014-08-18 13:20:57 +01:00
ocornut
c5dacee3a7 Undo Begin() return false with Alpha==0.0, misleading at the moment 2014-08-18 13:18:32 +01:00
ocornut
d6f6afabb3 Initialised window->Accessed in constructor. Begin() return false with Alpha==0.0 2014-08-18 13:09:48 +01:00
ocornut
76a39ad224 Added global Alpha in ImGuiStyle + commented ImGuiStyle fields in .h 2014-08-18 13:03:02 +01:00
Sepehr Taghdisian
c2cb727ac9 memory override attempt #2 2014-08-18 16:08:03 +04:30
Sepehr Taghdisian
47fd8431c1 minor fixes 2014-08-18 13:19:35 +04:30
ocornut
926f7bfcc5 Added InputFloat4(), SliderFloat4() helpers. 2014-08-17 14:16:10 +01:00
ocornut
f6414f2011 Invisible child windows gets clipped earlier in the pipeline. 2014-08-17 14:02:32 +01:00
ocornut
c32221fa20 Child window with inverted clip rectangles are marked as collapsed. 2014-08-17 11:28:19 +01:00
ocornut
a165954a69 Reduce inner window clipping to take account for the extend of CollapsingHeader 
from arikwestbrook
 2014-08-17 10:41:36 +01:00
ocornut
ddf8b280e9 Allowing the user to call NewFrame() multiple times without calling Render() 
Note that this is never a good idea. But, allowing it reduce confusion
in the initial stage of setup.
 2014-08-16 18:47:59 +01:00
ocornut
969b1e0563 Fix clipping of title bar text. 2014-08-16 18:22:52 +01:00
ocornut
6e15b71663 Minor todo/readme changes 2014-08-16 14:19:19 +01:00
Sepehr Taghdisian
ef628a0a9d argh, removed redundent defines 2014-08-16 13:35:44 +04:30
Sepehr Taghdisian
df5a06f119 removed memory pools, they dont apply well 2014-08-16 13:34:45 +04:30
Sepehr Taghdisian
e9b697698a fixed a typo 2014-08-16 13:12:24 +04:30
Sepehr Taghdisian
5240013c90 merge with upstream 2014-08-16 13:00:39 +04:30
Sepehr Taghdisian
1956703c42 First attempt at memory management 2014-08-16 12:58:29 +04:30
ocornut
f5dbb0a973 Fixed floating-point precision issue making the right-side value of a plot sometimes wrap to the left-side value. 2014-08-15 17:54:42 +01:00
ocornut
ade21a1ad5 PlotLines(), PlotHistogram(): added a stride parameter. 2014-08-15 17:36:54 +01:00
ocornut
868ba05a13 Slowed down mouse wheel scrolling speed in combo boxes 2014-08-15 16:40:31 +01:00
ocornut
152878571e TreeNode/CollapsingHeader ignore clicks when CTRL or SHFIT are held + make default button hover brighter 2014-08-15 16:38:29 +01:00
ocornut
fa0aa5ace6 Added storage for up to 5 mouse buttons for convenience (even though ImGui itself only uses 1) 2014-08-15 16:22:03 +01:00
ocornut
6267905a17 Added BeginTooltip()/EndTooltip() helpers to create tooltips with custom widgets 2014-08-15 16:18:00 +01:00
ocornut
1509b8f634 Added TODO list items from users feedback 2014-08-15 12:35:39 +01:00
ocornut
2bc6346b48 Added TextColored() helper. Changed some parameters to const references (still allows implicit casting) 2014-08-15 12:32:53 +01:00
ocornut
9169b2911c Fixed trailing \n reporting extra text height 2014-08-14 17:01:42 +01:00
ocornut
a4b96445e8 Fix typo and speculative warning 2014-08-14 16:02:42 +01:00
ocornut
6c11d7623e Fix invalid .ini file data persistently saving back on next save 2014-08-14 15:51:55 +01:00
Sepehr Taghdisian
6d6ee4e1f1 revert back to original 2014-08-14 19:21:01 +04:30
ocornut
f33eb89018 Fix tooltip data needlessly leaking into .ini file 2014-08-14 15:43:58 +01:00
Sepehr Taghdisian
e9b0a61f48 :w 
a
A
A
A
A
A
A
B
B
B
B
B
B
B
B
B
B
D
D
merged with upste
Merge remote-tracking branch 'upstream/master'
 2014-08-14 18:59:08 +04:30
ocornut
a8d3b045b7 Fix for doing multiple Begin()/End() during the same frame 2014-08-14 15:18:34 +01:00
ocornut
a830037eab Default "local only" clipboard handler on non-Windows platforms 2014-08-14 15:03:10 +01:00
ocornut
309ff44579 Undo IsHovered > IsItemHovered, shorter name wins 2014-08-14 14:32:01 +01:00
ocornut
f30d23a502 Tweaks, more consistent #define names 2014-08-14 14:31:13 +01:00
ocornut
a905505cca Added GetItemBoxMin(),GetItemBoxMax(), renamed IsHovered()-->IsItemHovered() 2014-08-14 12:43:30 +01:00
ocornut
29863b55ef Fixed logarithmic sliders and HSV conversions on Mac/Linux 
Tricky bug, I was calling abs() which resolve to abs(float) under
Windows with the include we have, but abs(int) under Mac/Linux
 2014-08-13 23:25:42 +01:00
ocornut
7a3e6aa38d Default Clipboard functions on Windows+ renamed ARRAYSIZE to IM_ARRAYSIZE 2014-08-13 19:53:26 +01:00
ocornut
cda3aecc6a Fixed combo box (bug introduced earlier today) + adding bit of vertical padding in combo. 2014-08-13 19:26:25 +01:00
ocornut
9a426faf4f Added InputFloat2(), SliderFloat2() 2014-08-13 18:46:18 +01:00
ocornut
cc9d63b46a Fixed columns lines not being pixel aligned 2014-08-13 17:08:44 +01:00
ocornut
ddc7f8b0b0 Simplified ImDrawList system (samples are 20 lines shorter) + merged title bar draw bar. 2014-08-13 11:34:08 +01:00
ocornut
57ac561ecb Minor warning fix + removed unused function parameter. 2014-08-12 20:05:10 +01:00
ocornut
2573ffb6fc Fixed warnings for more stringent compilation settings. Added various small helpers. 2014-08-12 19:57:46 +01:00
ocornut
901e9890d4 Removed stray debug code 2014-08-12 13:55:43 +01:00
ocornut
150ad95bd6 Missing assert + comments 2014-08-12 00:36:13 +01:00
ocornut
ab8561e6fc Tweaked checkbox/radio default hover color to be less distracting. Added GetItemWidth(). Added text filter to style editor. 2014-08-12 00:04:13 +01:00
Omar C
2a1ba33263 Merge pull request #9 from mhristov/master 
Checkbox & radio button improvements
 2014-08-11 23:37:53 +01:00
ocornut
080eb69e68 Removed dependency on limits.h 2014-08-11 22:31:45 +01:00
Mirolyub Hristov
1b330f420e Checkboxes and radio buttons can be clicked on their labels as well as their icon 2014-08-11 21:43:48 +02:00
Mirolyub Hristov
28df6f39d9 Added ImGuiCol_CheckHovered to show hovered checkboxes and radio buttons 2014-08-11 21:35:27 +02:00
Sepehr Taghdisian
e3001fb986 project update 2014-08-11 20:43:24 +04:30
ocornut
8ab2942716 Added PixelCenterOffset for OpenGL/DirectX compatibility. 2014-08-11 14:51:22 +01:00
ocornut
900dd3bd0f Update README.md 
Clarifying C++
Added item in todo list
 2014-08-11 12:45:47 +01:00
ocornut
678f6d3a3d Missing includes for some platforms 2014-08-11 12:13:05 +01:00
ocornut
dbd777232a Initial release 2014-08-10 21:58:11 +01:00