ocornut
76ab5587e4
GetColorU32: Comments
2015-12-13 19:55:15 +00:00
ocornut
9b6b1bc0f3
Added GetColorU32 helpers (previously internal and misplaced as window->Color())
2015-12-13 19:32:37 +00:00
ocornut
7bcebdc207
Comments and missing forward declaration
2015-12-13 18:02:15 +00:00
ocornut
8afbdd1ade
ImColor: Added SetHSV helper function.
2015-12-13 17:17:53 +00:00
ocornut
9583868bab
Added ImGuiIO::ClearInputCharacters() superfluous helper.
2015-12-12 00:08:54 +00:00
ocornut
c80e2274f1
Renamed Color() helpers to ValueColor() - dangerously named, rarely used and probably to be made obsolete.
2015-12-04 23:39:54 +00:00
ocornut
1aac69c937
Columns: tidying up, moving OffsetT to a ImGuiColumnData structure
2015-11-26 23:01:15 +00:00
ocornut
92c518a420
InputText: Added password mode via ImGuiInputTextFlags_Password ( #237 , #363 , #374 )
2015-11-19 23:09:59 +01:00
ocornut
5549744e0f
Minor popups comment tweak ( #402 )
2015-11-15 19:09:30 +01:00
ocornut
f87deff0f3
Moving stdlib.h include outside of imgui.h ( #405 )
2015-11-13 17:08:54 +01:00
ocornut
5f0db60a57
Version number 1.47 WIP
2015-10-18 20:13:01 +01:00
ocornut
72dde4d323
Version 1.46
2015-10-18 17:36:27 +01:00
ocornut
214e87d59c
InputText: comments.
2015-10-18 12:18:28 +01:00
ocornut
a5c895f791
Added SetClipboardText / GetClipboardText helper shortcuts to match MemAlloc / MemFree
2015-10-12 12:20:01 +02:00
ocornut
8c5c0c41fc
ImDrawList: AddImage() uv parameters default to (0.0) and (1.1)
2015-10-11 17:17:03 +02:00
ocornut
e83b529846
BeginChildFrame() helper has the extra_flags parameter.
2015-10-07 00:22:44 +02:00
ocornut
7508d30b83
ImGuiTextBuffer: added c_str() helper.
2015-10-04 11:22:47 +02:00
ocornut
e031fe484c
Added ImGuiWindowFlags_NoBringToFrontOnFocus behavior.
2015-10-02 19:07:04 +02:00
ocornut
572bf91006
Comments
2015-09-30 15:35:30 +02:00
ocornut
ecb63ff8f3
Inline functions not marked with IMGUI_API because apparently it is illegal for MinGW ( fix #349 )
...
ARGH C++.
2015-09-27 22:28:16 +02:00
omar
9d89e03346
Merge pull request #348 from zho7611/add_korean_support
...
ImFontAtlas: Added GetGlyphRangesKorean() for Korean.
2015-09-23 18:49:11 +02:00
Jiho Choi
cc53d31764
Add support for Korean.
2015-09-24 00:50:00 +09:00
ocornut
914516110c
Minor spacing
2015-09-22 00:53:11 +02:00
ocornut
ec7eb05e88
ImGuiTextFilter::Draw helper return bool and resplit when filter is modified
2015-09-14 13:03:20 +01:00
ocornut
0abe668221
ImFontAtlas: Added TexDesiredWidth and tweaked default cheapo best-width choice( #327 )
2015-09-11 16:50:00 +01:00
ocornut
1793c1a991
Comments
2015-09-09 14:15:17 +01:00
ocornut
b4f1e88860
Added ImGuiInputTextFlags_ReadOnly flag for InputText()/InputTextMultiline() ( #211 )
2015-09-09 09:08:08 +01:00
ocornut
f5fb5f0c1e
Minor tidying, reordering functions/members/initialisation to follow same orders
2015-09-07 23:39:36 +01:00
ocornut
dafad3903e
Added GetDrawData() alternative to setting a Render function.
2015-09-07 14:56:39 +01:00
ocornut
dbc7903da8
IsMouseHoveringRect() added 'bool clip' parameter to disable clipping the rectangle with the current parameters ( #316 )
2015-09-03 13:13:13 +01:00
ocornut
09f659271e
ImFont: fixed comment ( #317 )
2015-09-03 10:42:38 +01:00
ocornut
fc052e24b2
Added ImGuiWindowFlags_NoFocusOnAppearing flag ( #314 )
2015-09-02 19:13:25 +01:00
ocornut
965fa3cb16
Version number 1.46 WIP
2015-09-02 19:09:19 +01:00
ocornut
c9e19f8953
Version number 1.45
2015-09-01 20:34:10 +01:00
ocornut
f195bf744f
Tabs to spaces
2015-08-30 22:15:33 +01:00
ocornut
1eef2c9108
Comment
2015-08-30 18:35:02 +01:00
ocornut
71026d3655
Added GetScrollX(), GetScrollX(), GetScrollMaxX() apis + demo ( #246 )
2015-08-30 18:33:38 +01:00
ocornut
65a191c005
Added optional Horizontal Scrollbar & allow user to explicitly set content width via SetNextWindowContentSize() etc ( #246 )
...
GetCursorPos, SetCursorPos, GetContentRegionMax,
GetWindowContentRegionMin, GetWindowContentRegionMax are now including
the scrolling amount. It PROBABLY shouldn't break anything for you, but
take note that SetCursorPosX(100.0f) puts you at +100 from the starting
x position which may include scrolling, not at +100 from the window left
side.
2015-08-30 16:37:56 +01:00
ocornut
d88b73a8b7
Added GetContentRegionAvailWidth() helper. Demo tweaks.
2015-08-30 15:35:59 +01:00
ocornut
0aa353868f
Minor internal shortcuts not calling GetCurrentWindow()
2015-08-30 10:49:47 +01:00
ocornut
2d565d4bfb
Style: rename ScrollbarWidth to ScrollbarSize (sorry!)
2015-08-29 23:47:47 +01:00
ocornut
65fe60f2b2
Split tree/collapsable into internal TreeNodeBehaviorIsOpened() helper (unsure..) ( #282 )
2015-08-29 18:13:30 +01:00
ocornut
0a11024459
IO.WantInputCharacters -> WantTextInput ( #305 )
2015-08-28 15:34:53 +01:00
ocornut
30461345aa
Removed default name parameter in Begin()
...
We already have a "Debug" window pushed to the stack in the first place
so it's not really a useful default.
2015-08-28 15:24:04 +01:00
ocornut
90e5c97f13
AddBezier()->AddBezierCurve(). PathBezierTo()->PathBezierCurveTo(), and reads current point back, more standard ( #311 )
2015-08-28 13:48:14 +01:00
ocornut
80ad773c87
ImDrawList: added AddBezier(), PathBezierTo() for cubic bezier curves ( #311 )
2015-08-28 13:18:34 +01:00
ocornut
e58f99179a
Examples: OpenGL: fix for retina screens + io.DisplayFramebufferScale storage ( #287 )
2015-08-27 19:51:02 +01:00
ocornut
a36001212f
ImDrawData: added ScaleClipRects() helper ( #287 )
2015-08-27 18:45:43 +01:00
ocornut
59d498f3d0
Added ColorConvertU32ToFloat4() helper and ImColor(ImU32) constructor.
2015-08-26 21:18:08 +01:00
ocornut
8cf7df7ec4
Added GetWindowHeight() for completeness + BeginGroup() comment.
2015-08-25 16:55:14 +01:00
ocornut
08b345efd9
ImDrawList: Add comments on the usage of drawing channels
2015-08-25 16:31:20 +01:00
ocornut
77b82ecad7
ImDrawList: Fixed issues with channels split/merge. Functional without manually adding a draw cmd. + Removed unnecessary parameter to Channe
2015-08-25 16:24:17 +01:00
ocornut
ad3c9f620d
Tabs to spaces
2015-08-25 12:40:40 +01:00
ocornut
063d26a191
Removed obsolete comment
2015-08-24 18:13:31 +01:00
ocornut
b1987d697f
Trim trailing whitespace ( #305 )
2015-08-24 13:50:18 +02:00
ocornut
425c6cb3a3
Remove CaptureInputCharactersFromApp and minor cleanups ( #305 )
2015-08-24 13:47:27 +02:00
Borislav Stanimirov
73917115a8
Added flag showing whether the GUI wants text input
...
Conflicts:
imgui.cpp
2015-08-24 13:44:43 +02:00
ocornut
97be3428f1
Added GetMousePosOnOpeningCurrentPopup().
2015-08-15 15:10:07 -06:00
ocornut
07de0448f9
ImGuiTextFilter: default parameter width=0.0f for no override, allow override with negative values
2015-08-13 21:51:34 -06:00
ocornut
307ed78006
ImGuITextBuffer: shallow tweak.
2015-08-13 21:48:08 -06:00
ocornut
42567a9516
ImGuiTextFilter::PassFilter() supports string range. Added [] helper to ImGuiTextBuffer.
2015-08-13 21:25:32 -06:00
ocornut
c98318a914
Renaming some argument to clarify the local vs screen coordinates
2015-08-12 22:46:39 -06:00
ocornut
f421f2f47e
IsWindowHovered() takes account of window hoverability (may be disabled because of a popup) + comment
...
Was a dupe of IsMouseHoveringWindow() anyway, they are now "clearly"
different.
2015-08-12 22:30:07 -06:00
ocornut
0c9fcdbe71
Allow to override ImDrawIdx type ( #292 )
2015-08-09 11:11:39 -06:00
ocornut
aa3c26fd30
IM_PRINTFARGS takes one argument. Moved pragma outside of .h ( #295 )
2015-08-08 12:26:22 -06:00
ocornut
b637850260
Merge branch 'master' of https://github.com/tpoechtrager/imgui into tpoechtrager-master
2015-08-08 12:18:59 -06:00
ocornut
14822609bd
Version number 1.45 WIP
2015-08-08 12:18:37 -06:00
Thomas Pöchtrager
947cf3434f
Added printf attribute to printf like text formatting functions
2015-08-08 19:29:11 +02:00
ocornut
a99ba42a39
Version number 1.44
2015-08-08 07:57:29 -06:00
ocornut
a793ad682d
Merge branch 'master' into 2015-07-cleanup
...
Conflicts:
imgui.cpp
2015-08-05 15:29:38 -06:00
ocornut
7fea3eacfe
Minor comments
2015-08-05 12:50:13 -06:00
ocornut
155873a6b0
Added GetContentRegionAvail() helper
2015-08-05 10:43:12 -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
e099798c97
Merge remote-tracking branch 'origin' into 2015-07-cleanup
2015-08-01 22:12:51 -06:00
ocornut
1e76c63bb6
Fixed comment
2015-08-01 08:07:16 -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
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
82727d7119
Version number 1.44 WIP
2015-07-18 14:07:22 -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
20db726a9a
Version number 1.44 WIP
2015-07-17 16:03:13 -06:00
ocornut
e8cb874afe
Version number 1.43
2015-07-17 06:51:25 -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
5e846612d3
ImFont: tweaks
2015-07-15 14:54:56 -06:00
ocornut
3e3d9f9a69
ImFontAtlas: allow AddFontDefault to take a config
2015-07-15 07:58:33 -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
ba9317b924
ImFont: storing offsets as X0/Y0/X1/Y1 analoguous to examples for stb_truetype
2015-07-13 16:08:49 -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
6520b6c458
ImDrawList: added AddRectFilledMultiColor() helper + minor optimisation.
2015-07-12 10:48:06 -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
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
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
09e8c4ec11
AA branch: Re-added PrimVtx() + PrimWriteVtx, PrimWriteIdx for finer control ( #133 )
2015-07-08 14:03:27 -06:00
ocornut
e5bea65582
Version number 1.42
2015-07-08 12:59:26 -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
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
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
3e4841765d
ImDrawList: winodw draw lists destructed properly on Shutdown()
2015-07-07 18:00:19 -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
02dbcf5405
ImVector<> cannot be re-defined ( #262 )
2015-07-07 11:27:22 -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
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
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
56553f33b8
AA branch: added style.AntiAliasedLines, style.AntiAliasedShapes ( #133 )
2015-07-05 19:09:53 -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
e9b81dd5ab
Comments
2015-07-03 15:32:10 -06:00
ocornut
fd3c6067bf
Add conditional #ifdef prior to imconfig.h to facilitate inclusion in build systems ( #255 )
2015-07-03 15:31:54 -06:00
ocornut
b69d7d9df3
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
2015-07-02 21:47:48 -06:00
ocornut
2f03511062
Added ImGuiKey_PageUp, ImGuiKey_PageDown for user.
2015-07-02 21:43:07 -06:00
ocornut
6826ab3ffd
Added GetKeyIndex() helper.
2015-07-02 21:32:29 -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
531d0ce7ce
Moving tooltips and popup chunks of imgui.h below widgets ( #219 )
2015-07-02 14:55:30 -06:00
ocornut
0201fe6ed1
Comments
2015-07-02 14:49:38 -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
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
eaaab0120a
Moved Inputs utilities to their own section in imgui.h + additional comments
2015-07-02 08:57:17 -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
47826830af
Adding TitleBgActive color - still issues with popups/menus ( #253 )
2015-06-30 13:40:13 -06:00
ocornut
1318e1b74c
AA branch: remove unused functions.
2015-06-30 13:30:25 -06:00
ocornut
4bb94a9e4d
AA branch: more optimisations.
2015-06-30 13:27:35 -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
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
4ac21aaa12
Version number 1.42 wip + todo list entries
2015-06-26 20:48:53 -06:00
ocornut
ea2c824192
Version 1.41
2015-06-25 21:38:24 -06:00
ocornut
5436266963
Added SetNextWindowPosCenter() ( #249 )
2015-06-23 15:34:44 -06:00
ocornut
2a041cfbe1
Added GetGlyphRangesCyrillic() helper ( #237 )
2015-06-23 14:13:22 -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
f10bbbb851
Minor comment fix ( #248 )
2015-06-22 07:57:45 -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
d0ea5942a9
InputTextMultiline() can clip + BeginChildFrame() returns bool. ( #200 )
2015-06-18 08:49:57 -06:00
ocornut
0795a60c6b
InputText() fixed multi-line selection clipping. ( #200 )
2015-06-16 20:35:46 -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
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
c82e72eecb
Selectable() parameter comment
2015-06-14 15:14:33 -06:00
ocornut
cf481e1a7b
Selectable() added flags ImGuiSelectableFlags_DontClosePopups , ImGuiSelectableFlags_SpanAllColumns ( #125 )
2015-06-14 12:41:40 -06: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
c603534d38
Version 1.40
2015-05-31 19:24:32 +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
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
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
eb4ffd5dbd
Added ImGuiListClipper helper to avoid using CalcListClipping() directly.
2015-05-31 12:33:24 +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
475498f2eb
Comments, moved Sliders below Drag & Input in imgui.h
2015-05-31 11:12:29 +01:00
ocornut
03ff2faacb
Comments
2015-05-31 11:01:22 +01:00
ocornut
c4cb768432
Comments
2015-05-31 10:53:42 +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
f0781d3a24
Added GetItemsLineHeightWithSpacing() helper.
2015-05-29 09:00:34 +01:00
ocornut
dcc7df2b21
Added BeginPopupContextVoid() helper for completeness ( #126 )
2015-05-27 23:28:53 +01:00
ocornut
1cb6a294b0
BeginPopupContextWindow() rearranged and clarified parameters ( #126 )
2015-05-27 23:07:24 +01:00
ocornut
938528e5ee
Added BeginPopupContextItem() / BeginPopupContextWindow() ( #126 )
2015-05-27 22:36:23 +01:00
ocornut
8c4c421f74
Added IsAnyItemHovered() public helper.
2015-05-27 22:02:12 +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
f841097e99
Button centering left to RenderTextClipped function.
2015-05-27 14:20:50 +01:00
ocornut
b8ee48a74b
OpenPopup() Comments
2015-05-27 09:18:04 +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
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
fd0108dbef
Comments
2015-05-25 23:37:08 +01:00
ocornut
3498617a3c
Comments.
2015-05-24 22:16:34 +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
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
92ded00fd9
Merge remote-tracking branch 'origin' into 2015-05-menus
...
Conflicts:
imgui.h
2015-05-18 23:32:32 +01:00
ocornut
da53caf310
Moved ImVector<> after the main block ( #219 )
2015-05-18 22:33:43 +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
e674df8101
Merge remote-tracking branch 'origin' into 2015-05-menus
2015-05-18 16:45:55 +01:00
ocornut
0e8c2f9d41
Comments
2015-05-18 14:10:59 +01:00
ocornut
4bd43bdb35
Renamed ImGuiWindowFlags_Menu to ImGuiWindowFlags_ChildMenu
2015-05-17 22:28:57 +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
e0594340ff
Moved internal window flags to higher bit-count
2015-05-17 16:29:00 +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
fa0f0f4507
ImVector: tweak growth strategy
2015-05-15 13:14:46 +01:00
ocornut
d9ca8f3145
Added IO.MetricsAllocs counter (number of memory allocations
2015-05-15 12:05:05 +01:00
ocornut
1e4c22c206
Added io.MetricsActiveWindows counter ( #213 )
2015-05-12 16:08:34 +01:00
ocornut
9d9cf31972
ImFontAtlas: added ClearFonts(), making the different clear funcs more explicit ( #224 )
2015-05-12 14:53:29 +01:00
ocornut
30552ecfd6
Fixed comment ( fix #223 )
2015-05-12 11:51:22 +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
5082182790
Merge remote-tracking branch 'origin' into 2015-05-menus
...
Conflicts:
imgui.h
2015-05-11 20:39:19 +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
34aad73fd8
Added ImGuiCol_TextDisabled
2015-05-11 19:36:32 +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
ocornut
c2c43928a9
Untabifiy
2015-05-11 09:26:53 +01:00
ocornut
4913668ea4
Fixed implicit conversion of NULL constant to bool ( fix #216 )
2015-05-11 09:23:29 +01:00
ocornut
f293bec97c
Added style.ScrollbarRounding #212
2015-05-09 10:13:56 +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
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
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
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
221f36e116
Comments, tweaks, metrics window tweak
2015-05-02 17:54:25 +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
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
0123fc8c0f
Removed comment
2015-04-19 23:56:35 +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
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
Stephan Dilly
b28ec1f3b1
fix outdated documentation
2015-04-14 00:40:46 +02: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
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
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
0dc3d07e7f
DragInt() step given as float to allow finer control of speed #180
2015-04-12 19:08:56 +01:00
ocornut
62abde5b37
DragFloat() latch value internally, allows finer control, honor precision settings, slow step with integer works #180
2015-04-12 19:07:48 +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
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
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
334fba2f56
Spacing
2015-04-09 17:33:17 +01:00
ocornut
707df6c7b7
ImDrawList: internal refactoring toward a following commit for indexed rendering.
2015-04-09 17:32:03 +01:00
ocornut
aa2935968e
Renamed AddArcFast() parameter 'tris' to 'filled'
2015-04-09 16:47:20 +01:00
ocornut
0fc1f5b17f
Revert AddArcFast()->AddArc(), removed modulo from function 200d3482dc
2015-04-09 16:45:14 +01: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
Stephan Dilly
5ba77928ba
fix initialising ints with float literals
2015-04-08 22:56:25 +02: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
33ef3992f7
Added IO.MetricsVertices counter
2015-04-07 13:36:11 +01:00
ocornut
fe64da6197
Allow SetWindowFocus(NULL) to remove focus
2015-04-06 11:19:31 +01:00
ocornut
f5310a2f2d
Comments
2015-04-04 19:03:39 +01:00
ocornut
28a45877aa
DragFloat() comment examples, not ready for prime-time #180
2015-04-03 16:21:24 +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
1247ce251f
Added DragFloat(), DragInt() work in progress #180
2015-04-03 14:07:52 +01:00
ocornut
e6792f84d4
Comments and organization of imgui.h
2015-04-03 10:22:18 +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
e03d2b2900
ImVec2/ImVec4 no-parameters constructs init to 0.0f. Saner. Couldn't measure perf differences in a simple stress test compiled in Debug mode
2015-04-01 15:57:09 +01:00
ocornut
bb385fabd4
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
2015-03-30 23:55:40 +01:00
ocornut
e16f2e898a
Version number 1.38 WIP
2015-03-29 10:09:14 +01: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
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
e1de4908f6
Removed bool return value from BegniPopup() at the moment, it is meaningless. Tidying up.
2015-03-26 19:18:06 +00:00
ocornut
91f8eb7b92
Added early version of BeginPopup/EndPopup() #126
2015-03-26 17:09:17 +00:00
ocornut
7e334013a0
Selectable(const char*, bool) version has bool defaulting to false
2015-03-26 16:42:46 +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
e176a8b93f
OCD normalising function comments not ending with a comma
2015-03-22 16:26:48 +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
b024ff85f7
Fixed comment
2015-03-21 15:15:16 +00:00
ocornut
810fcd8bcb
Added mouse cursor types handling + embed mouse cursor data #155
2015-03-21 13:59:19 +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
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
2d29907611
Added GetMouseDragDelta() helper. No unlock threshold yet ( #167 )
2015-03-20 10:49:17 +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
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
ed0f0dbe87
ImDrawList::AddText() takes a const ImFont*
2015-03-18 14:58:17 +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
Adam D. Moss
1de735ba7c
GetItemBoxMax: fix obsolete function copy-n-paste bug
2015-03-18 11:27:37 +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
be83c07957
Changed mentions of 'box' to be 'rect'
2015-03-17 23:41:20 +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
ea720963cf
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
2015-03-16 10:21:25 +00:00
ocornut
0fc9168439
Added InputInt2(), InputInt3(), InputInt4()
2015-03-15 11:30:00 +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
1ac4f33736
Added VSliderFloat()
2015-03-15 01:58:14 +00:00
ocornut
98eeeab025
Added ImGuiStyleVar_GrabMinSize enum value for PushStyleVar()
2015-03-15 01:23:56 +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
1c1a55f6b1
Added IsRootWindowFocused(), IsRootWindowOrAnyChildFocused(). Renamed GetWindowIsFocused() to IsWindowFocused()
2015-03-13 12:25:43 +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
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
32312e538e
Renamed style.ScrollBarWidth to style.ScrollbarWidth to be consistent with other casing.
2015-03-08 15:03:55 +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
e01500f046
Added comments on columns function; Added GetColumnIndex(), GetColumnsCount(), #154
2015-03-07 12:18:01 +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
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
8691c5ca42
Version number + commented failing test case
2015-03-03 15:52:56 +00:00
ocornut
f4458f7571
Version number
2015-03-02 10:10:46 +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
ea17240b96
Spacing
2015-02-27 09:16:12 +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
fe48562171
Comments for IMGUI_API
2015-02-25 23:10:17 +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
ocornut
e022e5cff6
Version number 1.33
2015-02-22 18:16:25 +00:00
ocornut
bab81318a9
Comments and changed ImVec2 parameters to const ImVec2&
2015-02-22 12:38:46 +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
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
4deeaea93c
BeginChild() return a bool analoguous to Begin(). if true you can skip submitting content.
2015-02-21 10:30:05 +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
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
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
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
6347179bb0
Added ListBox() ( #129 )
...
Along with ListBoxHeader(), ListBoxFooter() helpers.
2015-02-11 00:21:27 +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
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
da2f5d9c48
Added ImGuiCol_ChildWindowBg, ImGuiStyleVar_ChildWindowRounding for completeness and flexibility
...
Upcoming features using it.
2015-02-10 13:00:22 +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
c907108c23
SetNextWindowPos api before SetWindowPos api in .h + comments
2015-02-08 16:43:20 +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
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
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
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
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
bde3f6b90d
Removed the dependency on realloc functionality #117 + fixed one alloc in NewFrame()
2015-02-01 14:39:13 +00:00
ocornut
56bf9ea067
Added comment on MemFreeFn as suggested by #119
2015-02-01 14:27:22 +00:00
ocornut
e636e0d2aa
Warning fixes ( fix #118 )
2015-02-01 09:33:51 +00:00
Jim Tilander
3478e3a708
Enabled us to create the internal state on client side allocated memory, e.g. a heap
2015-01-31 21:55:19 -08:00
Jim Tilander
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
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
4437293b79
Added ImDrawList::SplitDrawCmd() to force multiple draw calls for depending rendering/blending + Comments
2015-01-31 09:51:25 +00: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
07f69966f8
ImDrawList::AddImage() color parameter defaults to white
2015-01-29 13:46:34 +01:00
ocornut
79042a3a3c
GetVoidPtr() functions like GetInt, GetFloat. Renamed GetIntPtr/GetFloatPtr to GetIntRef/GetFloatRef
2015-01-29 10:22:32 +01:00
Daniel Collin
c9c41c3874
Added Set/GetVoidPtr in ImGuiStorage
2015-01-28 21:31:22 +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
26174cba85
Added InvisibleButton()
2015-01-21 23:03:25 +01:00
ocornut
56ac857cac
Added stub for obsolete GetDefaultFontData() to help the user upgrading
2015-01-18 15:12:41 +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
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
cb9a3235be
Removed PixelCenterOffset, uncesssary
2015-01-17 17:17:18 +00:00
ocornut
014f88b1fc
Font fixes for horizontal centering within frames
2015-01-17 15:44:25 +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
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
584c7ffac8
Added SetCursorScreenPos() helper (WindowPos+CursorPos = SrceenPos)
2015-01-15 14:41:22 +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
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
e2d8c03e1a
Fixed ImGuiTextBuffer::empty() to ignore the enforced zero-terminator
...
+ removed unnecessary destructor
2015-01-13 23:06:55 +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
cc79b85c28
Added first-pass of Image() based on #73 + demo
2015-01-11 16:30:39 +00:00
ocornut
1a6e7f25e0
ImVector: less hoops in back() / front(), more friendly for debugger and unoptimized builds
...
+ fixed typos
2015-01-11 16:25:57 +00:00
ocornut
f77490cb2d
Cleanup extra_fonts/ folder
2015-01-08 23:49:17 +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
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
0505995193
Very minor code/comments tweaks.
2015-01-04 22:29:53 +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
12225abfe2
Version number (fix)
2014-12-31 10:38:36 +00:00
ocornut
f8c58fe328
Fix for Clang
2014-12-30 16:55:32 +00:00
ocornut
da5227fa28
Added comment about defining IMGUI_OVERRIDE_DRAWVERT_STRUCT_LAYOUT in imconfig.h
2014-12-30 15:44:19 +00:00