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 |
|