omar
73f9c9d80c
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
2017-08-11 13:44:25 +08:00
omar
7e452ec737
Renamed ImGuiSetCond_XXX type and enums to ImGuiCond_XXX, kept old enums under #ifdef IMGUI_DISABLE_OBSOLETE_FUNCTIONS
2017-08-11 13:36:28 +08:00
omar
53d1b1e929
ColorPicker: Fixes for when ImGuiColorEditFlags_NoOptions flag is set: always read a default picker type + forward flag to sub ColorEdit widgets. ( #346 )
2017-08-10 10:25:50 +08:00
omar
fed18d3203
Removed old ValueColor() helpers. ( #346 )
2017-08-09 23:04:26 +08:00
omar
fc5ab0cb8d
RenderCheckMark() tidying up
2017-08-09 22:56:01 +08:00
omar
4fd148f4f9
Added ImFontAtlas::GlyphRangesBuilder helper + doc
2017-08-09 22:42:03 +08:00
omar
43e2abbee3
Comments, FAQ entry ( #586 , #1105 )
2017-08-09 20:27:59 +08:00
omar
55b99d753c
Minor string typo
2017-08-08 23:12:23 +08:00
omar
30d1e5712a
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_internal.h
2017-08-08 17:30:32 +08:00
omar
a78ef7a369
Comments
2017-08-08 16:07:17 +08:00
omar
942cb0e1f2
Added SetColorEditOptions(). ColorPicker4: context menu to select picker type and alpha bar. Reorganized flags (again!). ( #346 )
2017-08-08 15:54:20 +08:00
omar
a4012fd5b2
Merge branch 'master' into 2016-02-colorpicker
2017-08-08 11:30:10 +08:00
omar
b5ad88627d
Merge various documentation tweaks, comments, todos from the Navigation Branch to reduce drift a little
2017-08-08 11:27:48 +08:00
omar
a1bcc8392e
Fixed GetScrollMaxX() debug left-over from 7096fd8500 ( #1271 )
2017-08-08 11:15:34 +08:00
omar
03700ad15e
Merge remote-tracking branch 'origin' into 2016-07-navigation
2017-08-07 22:51:18 +08:00
omar
1c991b525a
Merge remote-tracking branch 'origin' into 2016-02-colorpicker
2017-08-07 22:34:30 +08:00
omar
0ab722c3c5
Columns: First first column appearing wider than others ( #1266 )
2017-08-07 22:28:09 +08:00
omar
d43c25d8f4
SetScrollHere() tweak to make the code a little less confusing
2017-08-07 21:54:41 +08:00
omar
e36b41cbd0
Fixed Y scroll aiming when Horizontal Scrollbar is enabled ( #665 ). Tweak log demo.
2017-08-07 21:53:57 +08:00
omar
7096fd8500
Fixes for Vertical Scrollbar not automatically getting enabled if enabled Horizontal Scrollbar straddle the vertical limit. ( #1271 , #246 )
2017-08-07 19:41:22 +08:00
omar
233a6efeba
Fixed GetScrollMaxX(), GetScrollMaxY(). Tweak demo to display more data. Using functions in Begin(). ( #1271 )
2017-08-07 18:35:15 +08:00
omar
46c73cccff
Popups window can be moved (if they don't have explicit positions provided by user, or e.g. sub-menu popup) ( #1252 )
2017-08-05 19:47:52 +08:00
omar
d762f1dbfb
Comments, clarification about io.WantCaptureMouse, io.WantCaptureKeyboard flags timing and NewFrame(). ( #1262 )
2017-08-05 19:15:03 +08:00
omar
95f2706d1c
Clipboard: [windows] Fixed not closing win32 clipboard on early return. ( #1264 )
2017-08-05 16:05:48 +08:00
omar
40ac84d701
DataTypeApplyOpFromText: renamed local variables + comments to avoid confusion about the fact that int and float paths are not totally symetrical. ( #671 )
2017-08-03 16:41:29 +08:00
omar
f6460970c5
ColorPicker: Hue wheel + SV triangle picker mode (mode selection flags still wip, missing context menu and persistent options). ( #346 )
2017-07-31 21:20:42 +08:00
omar
fb54dce71c
Internals: Added ImLineClosestPoint, ImTriangleClosestPoint helpers. Changing ImVec2 arg to const ImVec2&
2017-07-31 21:11:41 +08:00
omar
72da4081f8
Internals: Added ImTriangleBarycentricCoords() helper. Renamed ImIsPointInTriangle() to ImTriangleContainsPoint(), with different arg order.
2017-07-31 17:54:40 +08:00
omar
2f508c7073
ColorEdit: Extract ColorOptionsPopup() function out of ColorEdit4(). ( #346 )
2017-07-31 17:32:07 +08:00
omar
10ef5a63f0
ColorPicker: Rearrange code to introduce alternate HSV picker/selector with simpler diff. ( #346 )
2017-07-31 16:50:28 +08:00
omar
cc3cce7567
Comments, minor tidying up.
2017-07-31 16:48:45 +08:00
omar
70ee41b8b3
ColorPicker: Reordered drawing code to match left-to-right display. Extra comments. ( #346 )
2017-07-31 12:08:20 +08:00
omar
4b2f157fb1
Renamed ImGuiColorEditFlags_ModeMask_ to ImGuiColorEditFlags_InputsModeMask_ ( #346 )
2017-07-31 11:50:14 +08:00
omar
efbb1ae04e
ColorPicker4: Fixed forwarding _HDR flag from ColorPicker4 back to ColorEdit4 components. ( #346 )
2017-07-30 23:22:48 +08:00
omar
3ee969c3e3
ColorPicker: Alpha bar using a checkerboard. ( #346 )
2017-07-30 23:11:59 +08:00
omar
3075d8bcd4
ColorEdit4: Preliminary support for ImGuiColorEditFlags_HDR flag (currently only lift limits). ( #346 )
2017-07-30 23:08:43 +08:00
omar
f6a89779c8
ColorEdit4: Hex input clamps integer components to 0..255 range during printout ( #346 )
2017-07-30 23:06:07 +08:00
omar
e1a00c3d26
ColorButton: Added frame border when style border are off. ( #346 ) @jdumas
2017-07-30 18:09:34 +08:00
omar
90fcd4a829
Renamed ImGuiColorEditFlags_NoColorSquare to ImGuiColorEditFlags_NoSmallPreview ( #346 )
2017-07-30 17:55:42 +08:00
omar
3fe7739b5d
ColorPicker: Honor ImGuiColorEditFlags_NoTooltip if for some reason user wants that. ( #346 )
2017-07-30 17:53:37 +08:00
omar
3ffcc72f98
ColorPicker: Better cursor/color preview over the color matrix. ( #346 )
2017-07-30 16:57:44 +08:00
omar
fef8aac523
ColorPicker4: hue/alpha bars draw arrows that would look right on all background. RenderArrow helper. ( #346 )
2017-07-30 16:15:52 +08:00
omar
3926bd08e1
ColorPicker: Added ImGuiColorEditFlags_NoSidePreview flag + optional reference color. Added more demo code. ( #346 )
2017-07-29 17:23:32 +08:00
omar
e84224bcd5
ColorEdit4: Can open context menu from inputs/drags as well ( #346 )
2017-07-29 17:00:56 +08:00
omar
6c82572a35
ColorEdit4: Fixed not returning true when clicking on the Original/Ref color in Picker spawned from ColorEdit4 + shallow tidying up ( #346 )
2017-07-29 16:11:20 +08:00
omar
7537dff806
ColorEdit4: Picker spawned from ColorEdit4 has a preview for original/previous color with revert button - WIP not really happy with it being in ColorEdit4 code ( #346 )
2017-07-29 15:54:45 +08:00
omar
6bc1572d31
ColorPicker: Comments. Single input value mode allow access to context-menu options. ( #346 )
2017-07-29 15:50:24 +08:00
omar
973d4a361b
ColorPicker: Forward AlphaPreview flag to its individual inputs/sliders. Split code into extra lines to make logic more readable. ( #346 )
2017-07-29 14:32:41 +08:00
omar
cdcda9ff68
ColorEdit4: Store edit options per window. Demo: Letting user change edit mode. ( #346 )
2017-07-29 14:01:05 +08:00
omar
c36d59a42a
ColorEdit, ColorPicker: AlphaPreview, AlphaPreviewHalf are explicit. Updated demo and using in style editor. 3x3 checkerboard more readable in half mode. ( #346 )
2017-07-27 17:16:46 +08:00
omar
b1cbd87a94
ColorEdit4: Minor tidying up. ( #346 )
2017-07-27 16:49:57 +08:00
omar
bfec9c657e
ColorButton: Pretty much gave up with getting the checkerboard + AA + rounding + blending + offset all working together with every combination under the sun. It works as long as you don't sneeze. ( #346 )
2017-07-27 16:26:32 +08:00
omar
a9df6bfe86
ColorButton: Fixed rounding corners artefact when there is a single cell.
2017-07-27 14:04:58 +08:00
omar
b7a563276d
ColorTooltip: Honor ImGuiColorEditFlags_HalfAlphaPreview flag by calling ColorButton(). Added HalfAlphaPreview to demo. ( #346 )
2017-07-27 11:07:46 +08:00
omar
c1c2b2400a
ColorButton: Undo ce203f99f5
2017-07-27 11:04:39 +08:00
omar
2e37db9002
ColorEdit4: Fix not forwarding ImGuiColorEditFlags_AlphaBar flag to ColorPicker4 ( #346 )
2017-07-27 10:49:01 +08:00
omar
27e5b09af1
ColorButton: ImGuiColorEditFlags_HalfAlphaPreview flag to render both opaque and alpha-with-checkerboard versions of the peak preview ( #346 )
2017-07-26 23:07:35 +08:00
omar
69dd1ed583
RenderColorRectWithAlphaCheckerboard() in one layer to shunt out anti-alasing artefacts when rounded. Added ImLerp(int,int,float). ( #346 )
2017-07-26 22:20:43 +08:00
omar
76bae2f015
ColorEdit, ColorPicker: Fixed broken build due to commiting an undesirable change in 78a8f798c5 ( #346 )
2017-07-26 17:46:48 +08:00
omar
19c6a9c0e0
ColorButton, ColorPicker: painfully made RenderColorRectWithAlphaCheckerboard more friendly to using Rounding and Border in style, still not perfect :( ( #346 ) + comments
2017-07-26 17:38:33 +08:00
omar
6796e771fd
ColorEdit, ColorPicker: added ImGuiColorEditFlags_NoAlphaPreview flag ( #346 ). Reorder flags again.
2017-07-26 16:28:01 +08:00
omar
ce203f99f5
ColorButton: Push a text baseline offset if higher than g.FontSize. ( #346 )
2017-07-26 15:52:17 +08:00
omar
78a8f798c5
ColorEdit, ColorPicker, ColorButton: Display grid under transparent colors (WIP) ( #346 )
2017-07-26 15:24:09 +08:00
omar
9d0e5beaa7
GetColorU32(ImGuiCol): avoid using GImGui twice since some implementation make it a TLS-ish variable with non-trivial accessors.
2017-07-26 14:35:50 +08:00
omar
95fe11b5bf
Added GetColorU32(u32) variant that does the style alpha multiply without a floating point round trip. Not 100% sure about that before the signature may seem ambiguous? But also make using imgui+drawlist more consistent in end-user extensions.
2017-07-26 14:34:59 +08:00
omar
4f1f251bd2
ColorEdit, ColorPicker: Context / options menu allows to toggle between u8 and float display. Using short words to avoid localization. ( #346 )
2017-07-23 19:02:26 +08:00
omar
8d32e8dae6
ColorPicker: Handle out of 0..1 range colors when displaying the cross hair. ( #346 )
2017-07-23 18:48:45 +08:00
omar
7b2d79cffd
ColorEdit: Added ImGuiColorEditFlags_Float flag to display and edit drag values in 0.0..1.0 range instead of 0..255. ( #346 )
2017-07-23 18:44:32 +08:00
omar
a8b202782f
ColorPicker,ColorButton: Honor Border/Shadow style settings ( #346 )
2017-07-22 19:37:13 +08:00
omar
790d0eb5be
ColorPicker: Added ImGuiColorEditFlags_AlphaBar option ( #346 )
2017-07-22 19:24:39 +08:00
omar
4355b2e422
ColorPicker: Honor ImGuiColorEditFlags_NoColorSquare flag + comments ( #346 )
2017-07-22 19:04:10 +08:00
omar
15be7e1a71
ColorPicker: new prototype for ColorButton() .Added _NoTooltip, _NoLabel flags. Changing _Alpha flag to _NoAlpha makes so much much sense and allow to revert default parameters to zero. ColorEdit4/Picker4 don't attempt to read/write fourth component, making ColorEdit3/Picker3 shorter/faster. Tooltip and Picker called from ColorEdit can have a title. Picker shows colored square. Moved ColorTooltip() to imgui_internal.h ( #346 )
2017-07-22 18:01:16 +08:00
omar
dd9c2f97a8
ColorPicker: Renamed _NoSliders to _NoInputs ( #346 )
2017-07-22 17:38:38 +08:00
omar
eba33deaf3
ColorPicker: Longer white line for hue/alpha selection, scale down according to ItemInnerSpacing. ( #346 )
2017-07-22 17:35:18 +08:00
omar
1edeea2f5a
ColorPicker: Removed extraneous ImGui:: prefixes + minor comments ( #346 )
2017-07-22 16:58:28 +08:00
omar
e79d7553b0
ColorPicker: Don't use Alpha setting when enabling all 3 sliders ( #346 )
2017-07-22 16:52:41 +08:00
omar
97bedd704c
Better, unified color tooltip ( #346 )
2017-07-21 03:06:25 +08:00
omar
c8553817d9
Merge branch 'master' into 2016-02-colorpicker
2017-07-21 02:34:19 +08:00
omar
138a9dbaeb
Tooltip: SetTooltip() is expanded immediately into a window, honoring current font / styling setting. Add internal mechanism to override tooltips (not exposed in BeginTooltip yet because bools are evil) ( #862 )
2017-07-21 02:21:48 +08:00
omar
e4007f7145
Internals: Move GetVisibleRect() a few functions above so it gets to hang out with its peers.
2017-07-20 22:30:56 +08:00
omar
85d9c8fb46
Internals: renaming IndexWithinParent to OrderWithinParent
2017-07-20 21:25:31 +08:00
omar
25f3717a1c
Removed IsPosHoveringAnyWindow() which was severaly broken and misleading (most people want to use io.WantCaptureMouse). Added dummy function with assert for now. ( #1237 )
2017-07-20 20:57:46 +08:00
omar
3e4cb40d45
Merge branch 'master' into 2016-02-colorpicker
2017-07-19 14:53:25 +08:00
omar
41f944238b
Comments about GlyphExtraSpacing ( #1192 )
2017-07-15 18:03:43 +08:00
omar
be7fa76fdd
Fixed Clang unknown-warning-ignored warning by ignoring it..... we are truly living in a special time ( #1090 )
2017-07-15 13:27:44 +08:00
omar
cb6d893a13
Comments ( #383 , #1224 )
2017-07-14 18:12:40 +08:00
omar
d3f4309491
Comments about ImGuiStyleVar enum ( #1198 )
2017-06-24 13:11:46 +02:00
omar
a5e0210902
Revert 978c84d2e9 because int32 >> 32 tends to warns on some compilers/settings. Add ImU64 type. ( #1184 )
2017-06-19 21:19:48 +02:00
omar
e47cf79773
Comments tweaks, typos ( #1188 )
2017-06-17 19:30:30 +02:00
omar
4c8d87d3fb
Comments ( #1188 )
2017-06-17 19:25:58 +02:00
omar
978c84d2e9
Removed dependency on int64_t type (unvailable in VS2008) by rewording an assert ( #1184 )
2017-06-16 14:08:17 +02:00
omar
12d265fa31
Version 1.51 WIP tag
2017-06-13 11:30:22 +02:00
omar
5e1caaaef3
Version 1.50
2017-06-02 12:22:34 +02:00
omar
7ad84b22f8
Comments
2017-06-02 12:13:47 +02:00
omar
62c4698a73
Further clarifications of the key indices passed to IsKeyXXX functions ( #1159 )
2017-05-27 17:55:48 +02:00
omar
8228dc20df
Merge branch 'master' into 2016-07-navigation
2017-05-26 13:44:08 +02:00
omar
c038339a4c
Merge branch 'master' into 2015-02-colorpicker
2017-05-26 13:43:36 +02:00
omar
9da53bcecd
ImFontConfig: Removed MergeGlyphCenterV in favor of a more multipurpose ImFontConfig::GlyphOffset. (Breaking change)
2017-05-26 13:42:36 +02:00
omar
bd9868f447
Scrollbar: Avoid rendering when sizes are negative to reduce glitches (not sure how this ever slipped through - perhaps because of WindowMinSize settings).
2017-05-13 20:25:09 +02:00
omar
dbfd5d6e9a
Ignoring unreasonnable Clang -wformat-pedantic warning ( #1090 )
...
See e.g.
http://clang-developers.42468.n3.nabble.com/The-p-conversion-and-cast-to-void-td4044226.html
2017-05-01 12:55:47 +02:00
omar
27b83a2cac
Merge branch 'master' into 2016-07-navigation
2017-05-01 12:38:33 +02:00
omar
89b1497843
Merge branch 'master' into 2016-02-colorpicker
2017-05-01 12:37:34 +02:00
omar
a0a6c8a2ef
Renamed ImDrawList::PathFill() to ImDrawList::PathFillConvex() for clarity. (breaking API)
2017-05-01 12:36:46 +02:00
omar
d878462866
End() avoid calling Columns() if no columns set is open, not sure what it wasn't the case.
...
Pros: Faster. Avoid early crashes StackId underflow that are meant to be more gracefully caught by CheckStacksSize() (with more explicit assert). Cons: Excercise less code.
2017-04-30 12:10:45 +02:00
omar
bbd44b4edd
Clarified asserts in CheckStacksSize() when there is a stack mismatch
2017-04-30 12:10:45 +02:00
Michael Link
8df58e2cfd
MenuItem should only be selected on release
2017-04-25 15:15:56 +02:00
omar
0e1950f7d6
Comments about child menu positioning ( #1086 )
2017-04-01 18:01:47 +02:00
omar
2a3c61e5f8
Merge branch 'master' into 2016-07-navigation
2017-03-16 19:31:12 +01:00
omar
92ea8d1131
Merge branch 'master' into 2016-02-colorpicker
2017-03-16 19:28:30 +01:00
Codecat
fdd11658eb
Fix ColorButton showing wrong hex value for alpha
2017-03-15 21:25:29 +01:00
omar
b8043d3ee5
Internal: Renamed ImLoadFileToMemory to ImFileLoadToMemory to be consistent with ImFileOpen + fix mismatching .h name ( #917 )
2017-01-14 13:47:16 +01:00
omar
b6c0227add
Merge branch 'master' into 2016-02-colorpicker
2017-01-11 21:03:35 +01:00
omar
c76be71acf
Merge branch 'master' into 2016-07-navigation
2017-01-11 21:03:25 +01:00
omar
6257b5814a
Added an explicit (internal) ClearActiveID() helper and removed the default NULL window parameter to internal SetActiveID(),
2017-01-11 20:56:55 +01:00
ocornut
a60b2cc645
Merge branch 'master' into 2016-02-colorpicker
2016-12-23 12:15:58 +01:00
ocornut
bb4d19ff7c
Merge branch 'master' - merge fix
2016-12-23 12:15:09 +01:00
ocornut
fdc70456f4
Merge branch 'master' into 2016-07-navigation
2016-12-23 12:13:52 +01:00
omar
081aec482b
Merge pull request #931 from nlguillemot/master
...
Combo, ListBox: Extra const correctness.
2016-12-21 20:06:04 +01:00
ocornut
baa2e3b451
Minor documentation tweaks
2016-12-21 18:42:52 +01:00
Nicolas Guillemot
36d78e0565
const correctness for Combo and ListBox
...
Since Combo and ListBox only read and display the list of items, they
should not modify the pointers inside the array of pointers passed in.
Adding "const" here makes it possible to call these functions with such
an array of const pointers. Previously, a cast to "const char**" was
required as a workaround, otherwise there was a compile error.
2016-12-04 12:54:31 -08:00
ocornut
55d651812d
Renaming and massaging internal Settings/Ini functions ( #923 )
2016-11-29 21:55:20 +01:00
ocornut
0b6211f907
Fixed clicking on a window's void while staying still overzealously marking .ini settings as dirty ( #923 )
2016-11-29 21:46:21 +01:00
ocornut
9235e0da46
SliderInt, SliderFloat(): Fixed edge case where style.GrabMinSize being bigger than slider width can lead to a division by zero ( #919 )
2016-11-29 21:07:26 +01:00
ocornut
ca9a918535
SliderInt(): Fixed reverse direction mode when (v_max-v_min)==-1 ( #854 ) (+ ref #919 )
2016-11-28 20:43:11 +01:00
ocornut
bbd0a37bd2
ImFileOpen: MinGW uses _wfopen() codepath to support UTF-8 filenames ( #917 )
2016-11-28 20:30:36 +01:00
ocornut
449c47c789
SliderInt, SliderFloat() interacting enforce modifying to the value to be consistent with other widget behaviors ( #919 )
2016-11-28 11:05:24 +01:00
ocornut
94c77edfa5
SliderInt, SliderFloat() Better display support for v_min==v_max range. ( #919 )
2016-11-28 11:03:48 +01:00
ocornut
0a483379af
Split SliderBehaviorCalcRatioFromValue() out of SliderBehavior(), fix + Not using fabsf() anymore
2016-11-27 18:34:46 +01:00
ocornut
004e863727
Split SliderBehaviorCalcRatioFromValue() out from SliderBehavior()
2016-11-27 18:32:24 +01:00
ocornut
67c6d6026a
Nav: SliderFloat() Fixed non-linear sliders in Nav branch ( #787 , #323 )
2016-11-27 18:29:38 +01:00
ocornut
3028ccc25b
Merge remote-tracking branch 'origin' into 2016-07-navigation
2016-11-27 18:25:20 +01:00
ocornut
f4cf972ea9
Merge branch 'master' into 2016-02-colorpicker
2016-11-27 18:21:14 +01:00
ocornut
219e4fb8fb
SliderInt, SliderFloat: Passing v_min==v_max disable setting value from clicking/dragging ( #919 )
2016-11-27 17:49:04 +01:00
ocornut
a868c32ed1
SliderInt, SliderFloat: Renaming
2016-11-27 17:43:32 +01:00
ocornut
61d5b46307
SliderInt, SliderFloat(): support reverse direction ( #854 )
2016-11-27 17:38:33 +01:00
ocornut
104b381023
Using _wfopen() under Windows+MSVC because fopen() doesn't support UTF-8 encoding. Wrapped as ImFileOpen(). ( #917 )
2016-11-27 16:43:36 +01:00
Geoffrey Tucker
66c4281290
Began improvements to columns API by splitting the Columns() function into BeginColumns() and EndColumns() and adding additional flags. The columns data still needs to be placed into a stack.
2016-11-13 23:58:09 -08:00
ocornut
98e1d500d4
Support for #define-ing GImGui and IMGUI_SET_CURRENT_CONTEXT_FUNC to enable custom thread-based hackery ( #586 )
2016-11-12 17:08:31 +01:00
ocornut
8553bab241
Ignoring overzealous GCC warnings ( #883 )
2016-11-11 20:17:35 +01:00
ocornut
941cf1b436
Merge branch 'master' into 2016-07-navigation
2016-11-09 15:21:36 +01:00
ocornut
ccb3db94da
Merge branch 'master' into 2016-02-colorpicker
2016-11-09 15:17:20 +01:00
ocornut
3689efb726
Font: Readme about icons
2016-11-06 22:53:36 +01:00
ocornut
da9feba539
Fixed missing frame padding on title bar text when Collapse triangle is disabled
2016-11-06 22:40:47 +01:00
ocornut
b376b68326
Font: Added io.FontDefault in ImGuiIO structure to make it easier to change default font from third-party or demo code
2016-11-06 21:50:18 +01:00
ocornut
ddf08ec2e8
BeginChild(const char*) applies stack id to provided label ( #894 , #713 )
2016-11-06 15:12:50 +01:00
Matt Keeter
32dbe836d0
Add user-facing IsPopupOpen function
2016-10-29 15:33:09 -04:00
ocornut
dd6163241c
Merge branch 'master' into 2016-02-colorpicker
2016-10-16 14:02:15 +02:00
ocornut
bdb34d1c11
Merge branch 'master' into 2016-07-navigation
2016-10-16 14:01:13 +02:00
ocornut
7252d93dcd
stb_textedit.h Merged from master 1.9 (merged bits from #473 )
2016-10-16 11:34:33 +02:00
ocornut
0d3f8807c7
Added a void* user_data parameter to Clipboard function handlers. ( #875 )
2016-10-15 11:36:43 +02:00
ocornut
cb7e1c18b5
Separator: Fixed zero-height bounding box resulting in clipping when at top of clipping rectangle ( #860 )
2016-10-10 22:37:59 +02:00
ocornut
4de35b4f30
Removed left-over empty op
2016-10-09 10:58:38 +02:00
ocornut
1810b3ff38
Added ImGuiCorner enum to clarify some internal code
2016-10-09 10:56:23 +02:00
ocornut
abaada4224
Removed the inconsistent shadow under RenderCollapseTriangle() (~#707)
2016-10-09 10:31:39 +02:00
ocornut
5957af8a80
Fixed not using IM_ARRAYSIZE() where appropriate
2016-10-09 10:08:03 +02:00
ocornut
fa73e5aa0e
Plot: Fixed calling with values_count == 0
2016-10-08 12:43:30 +02:00
ocornut
51111b0ed5
FAQ clarified the ClipRect entry a little
2016-10-07 10:27:19 +02:00
ocornut
e4deb7a190
Merge remote-tracking branch 'origin' into 2016-07-navigation
2016-10-07 09:52:14 +02:00
ocornut
404979e48d
Merge remote-tracking branch 'origin' into 2016-02-colorpicker
2016-10-07 09:52:00 +02:00
ocornut
a2487bc143
Minor tweaks
2016-10-01 15:16:17 +02:00
ocornut
68c81739bf
Minor tidying up following merge BGRA color PR ( #844 )
2016-10-01 14:29:12 +02:00
ocornut
eb0382a1c1
Merge branch '2016-08-use_bgra_colors' of https://github.com/thedmd/imgui into thedmd-2016-08-use_bgra_colors
2016-10-01 14:19:25 +02:00
ocornut
dfe4683c17
EndGroup(): Made IsItemHovered() work when an item was activated within the group ( #849 ) (loosely follows #840 )
2016-10-01 14:10:24 +02:00
Michał Cichoń
1999c01db8
Apply Omar feedback and convert remaining 0xAABBGGRR's into IM_COL32(RR,GG,BB,AA) format.
2016-09-26 12:00:33 +02:00
Michał Cichoń
d75d2b1871
Introduce IMGUI_USE_BGRA_PACKED_COLOR in imconfig.h.
...
When IMGUI_USE_BGRA_PACKED_COLOR is defined packed color hold in ImU32 use BGRA format instead RGBA.
2016-09-26 12:00:33 +02:00
ocornut
fea0fcb7c3
Merge remote-tracking branch 'origin' into 2016-07-navigation
2016-09-25 15:25:55 +02:00
ocornut
6def01be5d
Fixed IsItemActive() lagging by one frame on initial widget activation ( #840 )
2016-09-25 14:32:38 +02:00
ocornut
f2699de242
Fix using IsItemActive() after EndGroup() or any widget using groups ( #840 , #479 )
2016-09-25 14:18:10 +02:00
ocornut
ed279c0095
Merge remote-tracking branch 'origin' into 2016-07-navigation
2016-09-25 12:59:24 +02:00
ocornut
1b5bbf725b
Merge remote-tracking branch 'origin' into 2016-02-colorpicker
2016-09-25 12:57:22 +02:00
ocornut
56cdbe434d
Style: Added ButtonTextAlign, ImGuiStyleVar_ButtonTextAlign ( #842 )
2016-09-25 12:53:13 +02:00
ocornut
0f303d363a
Refactor text alignment options to use ImVec2, removed ImGuiAlign ( #842 , #222 )
2016-09-25 12:19:15 +02:00
ocornut
de9f8944ea
Internal RenderTextClipped() merged optional/rate clip_min* clip_max* into clip_rect*
2016-09-25 11:38:04 +02:00
ocornut
02cea0c3c3
Comment
2016-09-25 11:16:19 +02:00
ocornut
281898e82e
Tidying up PushStyleVar/PopStyleVar() a little more ( #842 )
2016-09-25 11:14:10 +02:00
ocornut
c5b8c6303a
Refactor PushStyleVar/PopStyleVar so it is constant time + can receive integers (yet unused) ( #842 )
2016-09-25 11:06:14 +02:00
ocornut
6e87f071b8
Shutdown() clear out some remaining pointers ( #836 )
2016-09-20 12:41:21 +02:00
ocornut
0420ab027e
Metrics: Displaying window position + moving extraneous line in IsPopupOpen().
2016-09-16 01:09:57 +02:00
ocornut
b397fb507e
Fixed EndGroup() not restoring offset properly. breaking SameLine() offset (caused by 954c890c67) ( #829 )
2016-09-13 09:18:17 +02:00
ocornut
612b17ef57
Fixing minor english typos ( #827 )
2016-09-11 22:02:35 +02:00
ocornut
f6d4ca6473
TODO list
2016-09-07 12:02:37 +02:00
ocornut
c0fcf223be
Fixed assert triggering when a window has zero rendering but has a callback ( #810 )
2016-09-03 19:02:57 +02:00
ocornut
3c384c2f10
Examples: Renaming opengl_example/ to opengl2_example/ for clarity (1/2 because git)
2016-08-25 10:18:09 +02:00
ocornut
ef10b984fe
Merge remote-tracking branch 'origin' into 2016-02-colorpicker
2016-08-23 17:00:47 +02:00
ocornut
f39513ac47
Merge remote-tracking branch 'origin' into 2016-07-navigation
2016-08-23 17:00:11 +02:00
ocornut
63d47bc5a4
ImFormatString() Fixed an overflow handling bug with implementation of vsnprintf() that do not return -1 ( #793 )
2016-08-23 16:55:06 +02:00
ocornut
e8e5c6d788
Nav: Comments. Fixed two -Wall warnings. Removed unused function. ( #787 )
2016-08-23 08:58:51 +02:00
ocornut
3883a2027f
Nav: Fixed Selectable() crash introduced earlier today in 43ee5d73 + added comments/assert ( #323 )
2016-08-21 17:52:42 +02:00
ocornut
df9bdf38f9
Nav: NavActivateId, NavInputId are no repeat actions. Repeat buttons handle it themselves already anyway. ( #323 )
2016-08-21 17:32:15 +02:00
ocornut
c6c7371a4c
Nav: Removed unnecessary test following 49ca1c2b88 ( #323 )
2016-08-21 16:11:53 +02:00
ocornut
49ca1c2b88
Nav: InitDefaultRequest saves a fallback item so PadMenu on a collapsed window gets us to the collapse button ( #323 )
2016-08-21 16:07:55 +02:00
ocornut
2303b67c40
Close button submitted after collapse button. Should have no effect. Consistent with expectation & will be used as fallback for nav ( #323 )
2016-08-21 16:05:19 +02:00
ocornut
252f094101
Nav: Undo 87eb749cbc, agressively including nav focus test in IsItemHovered() ( #323 )
2016-08-21 15:26:40 +02:00
ocornut
fddf9ca10e
Nav: Fixed nav highlight clipping (affected non non-menu items within menubar) ( #323 )
2016-08-21 15:25:29 +02:00
ocornut
78b7e2dfb3
Nav: Process and apply mouse move request immediately after move request result comes ( #323 )
2016-08-21 14:53:26 +02:00
ocornut
f71cdd13b7
Internal tidying up, moved code to CalcNextScrollFromScrollTargetAndClamp() so it can be reused by upcoming nav code.
2016-08-21 14:39:13 +02:00
ocornut
ac7826c8a5
ImRect: Added Translate() helper, removed redundant and misleading Reduce()
2016-08-21 14:37:48 +02:00
ocornut
87eb749cbc
Added IsItemHoveredOrFocused() (provisional name), better handling of popup/tooltip positioning when using mouse+nav ( #323 )
2016-08-21 13:25:40 +02:00
ocornut
ea2425ad9a
Nav: Fixed entering child with PadActivate not setting ActiveIdSource to Nav ( #323 )
2016-08-21 12:44:59 +02:00
ocornut
43ee5d73e9
Nav: Hovering MenuItem/Selectable with mouse makes NavId, matching what seems to be Windows beahvior at least for menus ( #323 )
2016-08-21 11:45:50 +02:00
ocornut
30c04d0dbe
Nav: Mouse pos passed to backend always rounded, so that lossy application of non-integer mouse pos doesn't lead to undesirable movement ( #3
2016-08-21 00:10:48 +02:00
ocornut
bf42657850
Nav: Clearing mouse hover flag using MouseClicked[] test instead of MouseDown[] so that invalid mouse button won't keep breaking nav ( #323 )
2016-08-20 23:59:54 +02:00
ocornut
695ca7bb45
Nav: Tidying up. Comments. ( #323 )
2016-08-20 23:27:25 +02:00
ocornut
4f7c63a7af
Nav: Fixed a bug where mouse positioning requests would be sent while opening submenus with mouse ( #323 )
2016-08-20 23:25:53 +02:00
ocornut
e4c099d67c
Nav: Comments + fixed handling of PadLeft in menus (fix e55882f) ( #323 )
2016-08-20 22:11:00 +02:00
ocornut
e3fec8c0aa
Renamed function ( #323 )
2016-08-20 19:19:58 +02:00
ocornut
ead79dcdac
Metrics: 64-bit display fix
2016-08-15 17:34:17 +02:00
ocornut
3ab0d5cdfd
Nav: NavHighlight gets its own color (default to Header color), made rectangle thicker ( #323 )
2016-08-15 13:07:39 +02:00
ocornut
cf16ba6572
Nav: Exposed RenderNavHighlight() in imgui_internal.h to increase discoverability and reordered arguments to be more consistent ( #323 )
2016-08-15 11:52:02 +02:00
ocornut
6c19d7b13c
Nav: Fixed clipping rect of navigation highlight, notably for collapsing arrow ( #323 )
2016-08-15 11:41:56 +02:00
ocornut
9501cd9991
InputText: Fixed calling callback on frame of losing active id, fix part of 848e62bfe0 (nav branch only)
...
#323 #701
2016-08-13 14:22:34 +02:00
ocornut
cff815fd2d
Merge branch 'master' into 2016-02-colorpicker
2016-08-11 23:22:15 +02:00
ocornut
a83f9b7885
Merge branch 'master' into 2016-07-navigation
2016-08-11 23:21:04 +02:00
ocornut
0f9addb002
Minor shuffle to ease merging branches. (tentative. fugly but those fields will be removed anyway)
2016-08-11 23:20:53 +02:00
ocornut
bfe1e163b8
Merge remote-tracking branch 'origin' into 2016-02-colorpicker
2016-08-11 23:01:48 +02:00
ocornut
4bc3f9d1f7
Minor shuffle to ease merging branches.
2016-08-11 22:59:44 +02:00
ocornut
996eb080fa
Merge remote-tracking branch 'origin' into 2016-02-colorpicker
2016-08-11 22:53:26 +02:00
ocornut
df1d1b5b25
Nav: DragBehavior: Adjust minimum step to displayed precision when using navigation ( #323 , #180 )
2016-08-07 20:40:57 +02:00
ocornut
09cba02d3f
Nav: DragBehavior: Fix for fast speed ( #323 #180 )
2016-08-07 20:31:51 +02:00
ocornut
761a74c62b
Selectable/MenuItem: Not activated on Click but only on Release is more standard ( #126 , #245 , #323 )
...
Apparently menu items started with OnClick (vs OnClickHoldRelease) when
doing #126 . Hope to not break anything.
Also allows using xxx_DontClosePopup flags.
2016-08-07 20:21:18 +02:00
ocornut
8828889d5e
Refactored rare transient bool stacks into a set of flags, added unexposed ImGuiItemFlags_SelectableDontClosePopup ( #323 )
2016-08-07 20:05:24 +02:00
ocornut
525ef5b357
Nav: Tweaked default highlight clipping (clipped by scrollbar) and removed subtle background ( #323 )
2016-08-07 15:31:00 +02:00
ocornut
a68132948b
Nav: Added ImGuiCol_NavWindowingHighlight into style ( #323 )
2016-08-07 15:26:04 +02:00
ocornut
6aa8019763
Nav: Fixed bug where pressing NavInput(Triangle) to turn slider/drag into text input would then change subsequent NavActivate as well ( #323 )
2016-08-07 15:19:29 +02:00
ocornut
e55882f74b
Nav: Allow PadLeft to close a menu ( #323 )
2016-08-07 15:18:04 +02:00
ocornut
c203be94c6
Merge remote-tracking branch 'origin' into 2016-07-navigation
2016-08-07 13:55:59 +02:00
ocornut
6eb35b8a04
BulletText(): doesn't stop displaying at the ## mark
2016-08-07 13:53:41 +02:00
ocornut
8a6d209f68
Nav: Failed movement request with no current NavId fallback to an InitDefaultRequest so that we always land somewhere on first move ( #323 )
2016-08-07 13:34:25 +02:00
ocornut
5ef8452509
Nav: Comments ( #323 )
2016-08-07 13:33:15 +02:00
ocornut
cbf24c13ca
Merge remote-tracking branch 'origin' into 2016-07-navigation
2016-08-07 12:15:21 +02:00
ocornut
5d1a0a6f77
Removed a handful of obsolete (trivial) function redirection from 1.34 and 1.38 (march-april 2015)
...
OpenNextNode() -> SetNextTreeNodeOpen()
GetWindowIsFocused() -> IsWindowFocused()
GetItemBoxMin() -> GetItemRectMin()
GetItemBoxMax() -> GetItemRectMax()
IsMouseHoveringBox() -> IsMouseHoveringRect()
IsClipped() -> !IsRectVisible()
2016-08-06 09:48:04 +02:00
ocornut
b8397c2933
Tweak comments ( #768 )
2016-08-06 09:40:26 +02:00
ocornut
a1521534ba
Merge branch '2016-08-generalized_visibility_test' of https://github.com/thedmd/imgui into thedmd-2016-08-generalized_visibility_test
2016-08-06 09:36:24 +02:00
ocornut
af33efb146
Using IM_COL32() for colors in a few spots ( #767 )
2016-08-06 09:35:05 +02:00
ocornut
a7f6ea592f
Moved GetColorU32 out of imgui_internal.h to avoid inlining mess ( #759 )
2016-08-06 09:22:41 +02:00
Michał Cichoń
7588dfb67e
Add ability to test arbitrary rectangle for visibility without need of moving cursor.
2016-08-05 11:47:16 +02:00
ocornut
d85c1be6b6
Nav: Reordered Cancel handling code so you you can leave a child within a popup without closing the popup ( #323 )
2016-08-04 12:53:46 +02:00
ocornut
c263961f07
Nav: Menu: Allow PadDown to open a menu from a menu bar, PadRight from a menu ( #323 , #126 )
2016-08-04 10:41:33 +02:00
ocornut
dcff032429
Nav: Moving all nav inputs to io.NavInputs[] float array, new enum labelled for gamepad. ( #323 )
2016-08-03 23:23:04 +02:00
ocornut
c0dcef4e16
Nav: Moving window with nav stick disables mouse hover ( #323 )
2016-08-03 21:02:27 +02:00
ocornut
36fa2b9523
Nav: DragBehavior removed bogus test ( #323 )
2016-08-01 22:23:56 +02:00
ocornut
2e52bee12e
Merge remote-tracking branch 'origin' into 2016-07-navigation
2016-07-31 17:00:44 +02:00
ocornut
907265d632
Using ImGuiID instead of ImU32 is a few places
2016-07-31 16:48:06 +02:00
ocornut
8b190f1100
Nav: quick tap on NavMenu with no focused window doesn't focus one (holding still does) ( #323 )
2016-07-31 16:12:01 +02:00
ocornut
e9c881e4de
Nav: fixed using NavMenu/windowing select when no window is already focused + cleanup code ( #323 )
2016-07-31 16:07:58 +02:00
ocornut
1ecbf73c97
Nav: working on early bits of documentation ( #323 )
2016-07-31 15:41:51 +02:00
ocornut
a154625a56
Nav: Not exposing ImGuiWindowFlags_NavFlattened because it requires much more work ( #323 )
2016-07-31 13:40:14 +02:00
ocornut
08a28c16ae
Nav: Merge FocusedWindow and NavWindow that were basically duplicate at this point ( #323 )
2016-07-31 13:38:57 +02:00
ocornut
2545d75c3b
Tidying up, removed two unnecessary window flags from being exposed in imgui.h
2016-07-31 13:05:13 +02:00
ocornut
b3cba62b80
Nav: Added experiment ImGuiWindowFlags_NavFlattened flag to cross over between parent and non-scrolling child windows ( #323 )
2016-07-31 12:55:23 +02:00
ocornut
769a1dd748
Nav: No scrolling while using windowing functionalities ( #323 )
2016-07-31 10:41:41 +02:00
ocornut
a88d189f18
Nav: MoveRequest doesn't affect io.NavUsable so that navigation failure doesn't trigger false positive & not needed (undo part of 3cc1419df)
2016-07-30 23:52:03 +02:00
ocornut
f72e2fd1b1
Merge remote-tracking branch 'origin' into 2016-07-navigation
2016-07-30 23:46:09 +02:00
ocornut
954c890c67
SameLine() with explicit X position is relative to left of group/columns (ref #746 , #125 , #630 )
2016-07-30 23:41:44 +02:00
ocornut
3cc1419df3
Nav: making io.NavActive more suitable for end-user detecting if they should pass inputs to game ( #323 )
2016-07-30 19:16:41 +02:00
ocornut
cc66731c39
Nav: Calling SetItemDefaultFocus() doesn't make mouse cursor dirty if nav highlight is off ( #323 )
2016-07-30 19:15:12 +02:00
ocornut
8d0186c82b
Nav: programmatic call to SetKeyboardFocusHere() doesn't quality as a nav input (doesn't position mouse) ( #323 )
2016-07-30 19:08:20 +02:00
ocornut
e2dd48ae65
Nav: Split _NoNav window flag into _NoNavInputs and _NoNavFocus ( #323 )
2016-07-30 18:06:05 +02:00
ocornut
4c4d750cae
Nav: Fixed Collapse icon disappearing when Nav is disabled (since b2aaab873d) ( #323 )
2016-07-30 18:05:14 +02:00
ocornut
3672105b87
Tidying up
2016-07-30 17:20:59 +02:00
ocornut
04157da291
Nav: first committed pass for manual moving and manual scrolling (after a bunch of attempts) ( #323 )
2016-07-30 17:18:34 +02:00
ocornut
4309b8c1ed
Clarifying that MovedWindow* apply to mouse moving only
2016-07-30 16:25:45 +02:00
ocornut
f2d1472481
Nav: Fixed navigating outside of current scrolling bounds (bug from 0cc20fca83) ( #323 )
...
+ spaces
2016-07-30 15:17:12 +02:00
ocornut
efc8858328
ImRect: fixed Clip() function being the other way around (INTERNAL API BREAKING CHANGE- wasn't exposed, hoping nobody uses that) + actually fixes the function behavior.
2016-07-30 14:38:33 +02:00
ocornut
d6ce800a20
Nav: ActiveIdAllowNavMove -> ActiveIdAllowNavDirFlags for more flexibility (nav up/down typically allowed on a single-line text input) ( #323 )
2016-07-30 14:31:34 +02:00
ocornut
d9d6b0e629
Nav: Renamed private ImGuiNavDir_ enum to use left/right/up/down to be consistent with key enums ( #323 )
2016-07-30 13:45:46 +02:00
ocornut
cbe03e3108
Nav: CalcListClipping/ImGuiListClipper: fix to ensure we can navigate clipped lists ( #323 )
2016-07-30 11:22:18 +02:00
ocornut
b3ddae07d1
Nav: not activating widgets with NavActivate when NavMenu is held ( #323 )
2016-07-30 11:11:17 +02:00
ocornut
b2aaab873d
Nav: collapse button is interactve, allow collapsing, tidying up, resize speed takes account of framebuffer scale ( #323 )
2016-07-30 10:56:52 +02:00
ocornut
4735802096
Shallow tidying up ctrl+wheel scaling code in NewFrame()
2016-07-30 10:26:57 +02:00
ocornut
20a0fde012
Tidying up default clipboard handler for non Windows-OS
2016-07-30 10:02:46 +02:00
ocornut
f34d7ea199
Fixed bad merge
2016-07-29 11:23:04 +02:00
ocornut
5f6f4d0ffc
Merge remote-tracking branch 'origin' into 2016-07-navigation
2016-07-29 11:17:13 +02:00
ocornut
7086a17854
InputTextEx: got rid of unnecessary locals.
2016-07-29 11:06:16 +02:00
ocornut
776ea6b946
InputTextEx(): more shallow tidying up, still being cautious with this function
2016-07-29 11:01:06 +02:00
ocornut
666d83b5c7
InputText/IO: Got rid of individual OSX options in ImGuiIO, added io.OSXBehaviors ( #473 , #650 )
2016-07-29 10:56:47 +02:00
ocornut
0ff22dbf0b
InputTextEx(): minor tidying up
2016-07-29 10:51:35 +02:00
ocornut
e5b6ddde26
InputText(): minor tidying up/simplification following changes for osx style improvements ( #650 )
2016-07-29 10:42:08 +02:00
ocornut
802e91f69e
Merge branch 'add-osx-homeend-keys' of https://github.com/michaelbartnett/imgui into michaelbartnett-add-osx-homeend-keys
2016-07-29 10:34:01 +02:00
ocornut
aeabda5a5f
Navigation: Tap NavMenu to access menu and close buttons, hold to focus/resize ( #323 )
...
Introducing a concept of NavLayer to filter navigable items
2016-07-24 14:56:14 +02:00
ocornut
c3aa36d9ab
Navigation: Renamed ImGuiKey_NavWindowing to ImGuiKey_NavMenu ( #323 )
2016-07-24 14:49:16 +02:00
ocornut
175f42420c
Navigation: Can nav-out but not nav-in a window with ImGuiWindowFlags_NoNav flag ( #323 )
2016-07-24 14:41:27 +02:00
ocornut
67feb5ac6c
Navigation: comments + moving init block of code above in NavUpdate(), should have no side-effect (committed to simplify next commit) ( #323 )
2016-07-24 14:15:34 +02:00
ocornut
49ec65b1b5
Navigation: can't manually focus out of a modal window with controller ( #323 )
2016-07-24 14:00:29 +02:00
ocornut
5cac4926c8
Fixed display of TitleBgActive color on window before a Modal window + modal window availability for navigation ( #323 )
2016-07-24 13:56:31 +02:00
ocornut
ba43310df1
Navigation: Renaming, shortened some unnecessary long fields names ( #323 )
2016-07-24 12:46:25 +02:00
ocornut
4bbdaa4e3c
Navigation: Moving NavInitWindow() around and making it static ( #323 )
2016-07-24 11:56:36 +02:00
ocornut
e9d8b48a4c
Navigation: Allow to navigate out of text input with direction or NavCancel ( #323 )
2016-07-23 20:30:44 +02:00
ocornut
2f94563564
Navigation: Collapsed window uses ImGuiCol_TitleBgActive when navigation is active ( #323 )
2016-07-23 20:09:41 +02:00
ocornut
afadc7cf59
Navigation: Scoring: Improved directional navigation. Not totally cancelling out dx. Better support for zero-spaced items. ( #323 )
2016-07-23 20:05:17 +02:00
ocornut
e74d96642f
Navigation: mouse/popup position gets clamped within visible display ( #323 )
2016-07-23 19:42:19 +02:00
ocornut
0cc20fca83
Navigation: Scoring uses rectangle as clipped by parent. Fix selectable extending past parent column among other things ( #323 )
2016-07-23 19:24:56 +02:00
ocornut
2f1fb41579
Navigation: Fixed automatic fallback scrolling from glitching near scroll limits because of miscalculation of SizeContents ( #323 )
2016-07-23 16:31:23 +02:00
ocornut
ad48309047
Navigation: Fixed using NavWindowed when a menu is open. ( #323 )
2016-07-23 16:01:27 +02:00
ocornut
2cab404a81
Fixed tooltip positioning issues when using navigation ( #323 )
2016-07-23 15:44:56 +02:00
ocornut
c2cb2a6928
Gamepad/Keyboard navigation support, initial commit, WIP ( #323 )
2016-07-20 00:02:59 +02:00
ocornut
4a11cc35b9
Updated code for repeat delay / repeat handling. GetKeyPressedAmount() now returns a count to support fast repeat rate (where DeltaTime > RepeatRate).
...
Renamed from recently added IsKeyPressed() variant to GetKeyPressedAmount(). (no API breakage, added in branch, bbd3b75609#323 )
2016-07-19 21:26:36 +02:00
ocornut
88c1966629
Added IsAnyWindowFocused(). Renamed IsMouseHoveringAnyWindow() -> IsAnyWindowHovered(), IsPosHoveringAnyWindow() -> IsAnyWindowHoveredAtPos(), IsMouseHoveringWindow() -> IsWindowHoveredRect() for consistency. Kept inline rediection function.
2016-07-18 18:24:23 +02:00
ocornut
23a81027e8
Comment on invalid comment regarding preserving keyboard focus of a closed window, due to commit 19d02becef. This is probably still what we want. (followup #727 )
2016-07-18 18:22:11 +02:00
ocornut
eb405ab375
DragBehavior: Moving code around, in what should be a no-op, to simplify upcoming Nav diff ( #323 , #180 )
2016-07-18 18:22:10 +02:00
ocornut
c816e6c742
Fixed SetScrollX() handling of center ratio (which actually wasn't exposed publicly). ( #323 , #246 )
2016-07-18 18:22:09 +02:00
ocornut
e10ecfe28a
BeginChild(): tweak to make the code easier to understand
2016-07-18 18:22:08 +02:00
ocornut
24f79b91bd
Style: minor tweak to default color theme to make currently focused window more prominent ( #323 , #707 )
2016-07-18 18:22:07 +02:00
ocornut
068984691e
Tab-key focusing inhibited when CTRL is held ( #323 )
2016-07-18 15:26:05 +02:00
ocornut
267e54cf06
NewFrame(): update activeid data and keyboard before mouse. Should have no side-effects! (So that later we can update Nav between Keyboard and Mouse) ( #323 )
2016-07-18 15:26:04 +02:00
ocornut
272745bd93
ImGuiIO: initializing fields in the same order as the declaration.
2016-07-18 15:26:03 +02:00
ocornut
848e62bfe0
InputText: don't process keys during the activation frame (this is mostly a workaround to that activation with enter doesn't validate immediately, which is turns triggers an assert in InputScalarAsWidgetReplacement - can't see an issue with changing it this way so trying out) + using local flag clear_active_id to only clear the active id at the end of the frame, which is one of the step that my stash for #701 requires. ( #323 )
2016-07-18 15:26:02 +02:00
ocornut
57841f417d
SliderBehavior, RoundScalar: split into separate functions for usage in upcoming nav commits. Testing power==1.0f without fabsf(). Maybe just use == 1.0f as well? ( #323 )
2016-07-18 15:26:01 +02:00
ocornut
6f7da2f9f2
Popup: Fixed popup initial frame reading MousePos again instead of the value already stored within the CurrentPopupStack in the previous frame. Doesn't make a big difference here, but will do as gamepad/keyboard navigation will set its own popup position. ( #323 )
2016-07-18 15:26:01 +02:00
ocornut
91e1c56da6
Minor bits.
2016-07-18 15:25:59 +02:00
ocornut
bbd3b75609
Added IsKeyPressed() with explicit repeat delay and repeat rate (for usage by nav) ( #323 )
2016-07-18 15:25:58 +02:00
ocornut
9f92cc255b
SetActiveId() sets ActiveIdIsJustActivated only when id changes. ( #323 )
2016-07-18 15:25:57 +02:00
ocornut
ffdd7d7f17
Begin: Moved code that calls FocusWindow() on a newly appearing window lower in the function so that Nav branch can use CursorStartPos on the first window frame. ( #323 )
...
Pushing in master because it _should_ be a no-op but I'd rather test for any issue in Begin() as soon as possible.
2016-07-18 15:25:44 +02:00
ocornut
19d02becef
Closing the focused window restore focus to the first active root window in descending z-order (part of #727 )
2016-07-17 19:17:49 +02:00
ocornut
e215905765
Fixed scrolling offset when using SetScrollY(), SetScrollFromPosY(), SetScrollHere() with menu bar.
...
Tests:
a) add SetScrollY(+20) after Begin("ImGui Demo") test with/without title/menu.
b) add ImGuiWindowFlags_MenuBar in BeginChild() in scrolling tracking demo.
2016-07-16 18:12:41 +02:00
ocornut
44a13a7f25
Windows: No default IME handler when compiling using GCC. ( #738 )
2016-07-16 11:29:41 +02:00
ocornut
04b36bc397
TODO list
2016-07-14 13:38:44 +02:00
ocornut
81036ee46f
InputTextMultiline(): fix so that IsItemActive() can be used afterwards (otherwise the info was lost by using child/group)
2016-07-14 13:27:14 +02:00
ocornut
88721118fd
InputTextEx: comments (related to #725 )
2016-07-13 01:54:29 +02:00
ocornut
d9e2e688e9
InputTextMultiline(): partial fix for when input and internal buffers differs in a way where scrollbar existence differs. ( #725 )
...
Partial fix, won't stop ids from functioning because of a zombie id.
2016-07-13 01:18:59 +02:00
Michael Bartnett
921fc50c85
add shortcut+backspace support
2016-07-07 13:03:00 -04:00
Michael Bartnett
86f42b5950
osx uses super+arrows for home/end, built on work in ocornut/imgui#473
2016-07-07 13:02:52 -04:00
ocornut
5525c2356a
Using GetCurrentWindowRead() instead of GetCurrentWindow()
2016-06-29 10:30:42 +02:00
ocornut
fe7274b6c7
SetCursorScreenPos() fixed not adjusting CursorMaxPos as well
2016-06-29 10:25:47 +02:00
ocornut
b9b3dec7da
ImGuiListClipper: Fix to behave within column ( #661 , #662 , #716 )
2016-06-29 10:19:01 +02:00
ocornut
74bbfcfaa6
ImGuiListClipper: fixed automatic-height calc path dumbly having user display element 0 twice ( #661 , #716 )
...
First bug out of two. Was easily visible using e.g. 50% alpha text.
2016-06-29 10:07:36 +02:00
ocornut
297bb3fc92
NextColumn() tidying up with a sane early out
2016-06-29 09:53:02 +02:00
ocornut
ba7acdac47
Added assert to track stb_textedit.h issue ( #715 )
2016-06-27 12:59:49 +02:00
ocornut
c36fd541ad
InputTextMultiline(): Fixed Ctrl+DownArrow moving scrolling out of bounds
2016-06-27 09:56:45 +02:00
ocornut
e06852abaf
Fixed Windows default clipboard leaving its buffer unfreed on application's exit. ( #714 )
2016-06-26 13:24:30 +02:00
ocornut
de61fcc619
Minor bits
2016-06-25 17:03:49 +02:00
ocornut
355dae5d99
Comments amend 3c8e490778 (committed before saving last comment edit) ( #703 )
2016-06-25 14:37:14 +02:00
ocornut
3c8e490778
Comment on dealing with io.WantCaptureKeyboard ( #703 )
2016-06-25 14:28:58 +02:00
ocornut
13615a1318
InputText: render currently edited buffer from the internal buffer, toward #701
2016-06-25 13:57:05 +02:00
ocornut
2f4e2eec68
InputText, ImGuiTextFilter: using strncpy instead of printf("%s").
2016-06-25 13:54:34 +02:00
ocornut
4621b357c1
Wrapped text: fixed incorrect testing for negative wrap coordinates, they are perfectly legal. ( #706 )
2016-06-19 12:50:22 +02:00
ocornut
92bff4c8d7
ColorEdit4(): better preserve inputting value out of 0..255 range, display then clamped in Hexadecimal form
2016-06-16 23:09:48 +02:00
ocornut
9cb271f4c8
Fixed minor text clipping issue in window title for when using font straying above usual line ( #699 )
2016-06-15 23:09:40 +02:00
ocornut
1ef7980e17
Merge branch 'master' into 2016-02-colorpicker
2016-06-15 10:05:17 +02:00
ocornut
c4db79f34b
Member variable name renamed "ID" "Id" for casing consistency
2016-06-12 22:27:15 +02:00
ocornut
9f21c7189f
TextUnformatted() fixed clipping bug in the large-text path when horizontal scroll has been applied ( #692 , #246 )
2016-06-12 12:23:16 +02:00
ocornut
d79186931e
ImDrawList: Fixed a (rarely occuring) bug with merging with previous command + unnecessary OverlayDrawList command
2016-06-11 15:42:10 +02:00
ocornut
3fd3eac370
Fixed TextWrapped() override wrap position is one is already set ( #690 )
2016-06-11 10:23:37 +02:00
ocornut
8291d7dc7c
Fixed minor bug introduced in 45dacbf084 ( #682 )
...
Actually minor because nobody uses that value. Still a terrible
bug.
2016-05-31 22:34:48 +02:00
ocornut
d1c073a199
Comments, tweaks
2016-05-31 00:00:44 +02:00
ocornut
254a1a9e4c
InputText: Added support for CTRL+Backspace.
2016-05-30 20:00:20 +02:00
ocornut
5d4cf1c3f3
Version 1.50 WIP
2016-05-30 19:38:36 +02:00
ocornut
adb85d800d
Version 1.49
2016-05-29 19:16:44 +02:00
ocornut
3ddb50a925
Merge branch 'master' into 2016-02-colorpicker
2016-05-29 19:07:23 +02:00
ocornut
0fb51b6b4b
Removed various superflous ImGui:: prefixes in internal code
2016-05-29 18:58:41 +02:00
ocornut
9886c1b43d
Undo modification of ContentsRegionRect.Max, too many side-effects (undo dff078365f)
2016-05-29 18:37:26 +02:00
ocornut
dcef7dedce
Comments ( #590 )
2016-05-29 18:24:02 +02:00
ocornut
784e1ef053
CollapsingHeader() with close button adapt to horizontal scrolling ( #600 )
2016-05-29 18:12:25 +02:00
ocornut
dff078365f
Fix selectable/tree node not reaching right-side of contents size when horizontal scrolling is active and no explicit size is known
2016-05-29 18:08:51 +02:00
ocornut
45dacbf084
Fixed GetWindowContentRegionMax() being off by ScrollSize amount when SizeExplicit is set + caching ContentsRegionRect.
...
Relates to horizontal scrollbar, explicit contents size
2016-05-29 17:50:23 +02:00
ocornut
d5a12866fe
Comments ( #676 , #655 )
2016-05-29 14:00:35 +02:00
ocornut
1483a69c11
Demo: Tree: showing how to align tree node label with current x position ( #324 , #581 )
2016-05-28 19:30:01 +02:00
ocornut
61c294bb52
Added optional Indent() Unindent() width ( #324 , #581 )
2016-05-28 18:40:00 +02:00
ocornut
a0a48f6e59
Added TreeAdvanceToLabelPos() ( #581 )
2016-05-28 18:15:54 +02:00
ocornut
806a146198
TreeNodeEx(): ImGuiTreeNodeFlags_AlwaysOpen->ImGuiTreeNodeFlags_Leaf, + added ImGuiTreeNodeFlags_Bullet ( #324 , #581 )
2016-05-28 17:12:13 +02:00
ocornut
8f4b123e1b
SetNextWindowSizeConstraint -> SetNextWindowSizeConstraints ( #668 )
2016-05-28 14:02:14 +02:00
ocornut
213025f3cd
BeginMenu: a menu that becomes disabled when open gets closed down, facilitate user's code ( #126 )
2016-05-28 11:14:02 +02:00
ocornut
65b1ae6ecc
Comments ( #335 )
2016-05-22 10:20:58 +02:00
ocornut
3a776d93f2
Fixed compile issue (bloody git stashes) ( #668 )
2016-05-21 23:03:21 +02:00
ocornut
b7ebeb1610
Added SetNextWindowSizeConstraint() + demo code ( #668 )
2016-05-21 22:53:08 +02:00
ocornut
713730af0c
Minor sizing refactor, should be no-op. Making it a commit for further bisection since sizing code is super brittle. ( #668 )
2016-05-21 20:55:28 +02:00
ocornut
102d03a7eb
Resizing window doesn't rely on MouseDelta anymore, but rather recompute expected size based absolute mouse coords. ( #668 )
...
Storing ActiveIdClickOffset to generalize pattern already used by
columns.
2016-05-21 20:50:15 +02:00
ocornut
81bf5aeb09
Minor bits
2016-05-21 20:07:51 +02:00
ocornut
1dfafeb602
CheckStacksSize() added literal strings in IM_ASSERT calls to reach end-user on common failure
2016-05-17 09:36:27 +02:00
ocornut
0e51f91c5e
Including limits.h again to get INT_MAX, assuming previous report of missing limits.h was erroneous ( #1 , yes, issue ONE!)
2016-05-16 20:27:52 +02:00
ocornut
69a29e4715
Added NewLine() (very shy reminder that #97 isn't done)
2016-05-16 20:14:07 +02:00
ocornut
47d10944a5
Build fix
2016-05-16 20:07:02 +02:00
ocornut
f291f2c5dd
InputText(): Fixed cursor rendering on first character when framepadding is 0.0 (following #601 )
2016-05-16 19:44:03 +02:00
ocornut
28b09199de
ImGuiListClipper: removed assert ( #662 )
2016-05-16 19:25:42 +02:00
ocornut
7a28f5bb81
ImGuiListClipper new version, detect height automatically, fix compatibility with SetScrollPosHere ( #662 )
2016-05-16 19:22:51 +02:00
ocornut
e79d2828c4
Metrics window: coarse clipping the detailed vertex buffer for pleasure and benefits.
2016-05-13 23:10:16 +02:00
ocornut
f48f9a30ef
ButtonBehavior(), fixed subtle old bug when a repeating button would also return true on release + comments ( #656 )
2016-05-13 11:13:54 +02:00
ocornut
e1e2752dcb
Fixed repeating button behavior triggering twice, typically affect the +/- of InputInt/InputFloat and user repeating buttons ( #656 )
...
+ Took note of further work
Broken in 547f34cf22
2016-05-13 10:50:59 +02:00
ocornut
8d5b2fba95
Fixed TitleBg/TitleBgActive color being rendered above WindowBg color, being inconsistent and causing visual artefact ( #655 )
...
Broke the meaning of TitleBg and TitleBgActive. Only affect values where
Alpha<1.0f. Fixed default theme.
2016-05-12 23:12:55 +02:00
ocornut
ed20fcf9d5
Fixed incorrect parameter to ButtonBehavior() in Columns code - had no side-effect ( #649 )
...
Broken in 3eabad0321
2016-05-11 10:31:30 +02:00
ocornut
91f11fb1bd
Comments / todos
2016-05-11 09:58:43 +02:00
ocornut
8648346eab
Modal: fixed non-child window stacked over a modal losing its hoverabilty/focusability ( #615 , #604 )
2016-05-10 17:02:10 +02:00
ocornut
b630cb5b42
ImGuiWindow: Storing ParentWindow ( #615 , #646 )
2016-05-10 17:00:42 +02:00
Branimir Karadžić
a59a04f4d0
Fixed iOS/OSX build.
2016-05-10 01:10:31 +02:00
ocornut
aa11934efa
Comments to clarify default shared ImFontAtlas and current context pointer thread-safety ( #586 , #591 )
2016-05-08 17:12:54 +02:00
ocornut
382253eccf
Merge branch 'master' of https://github.com/ocornut/imgui
2016-05-07 21:10:16 +02:00
ocornut
36ca8a8194
Minor warnings fixes.
2016-05-07 21:09:53 +02:00
omar
8af76d56b4
Merge pull request #639 from sergof/conversion-warnings
...
Ignore various anal GCC warnings.
2016-05-07 21:08:43 +02:00
ocornut
7b9c0a5c3f
Renamed ImGuiState -> ImGuiContext ( #586 , #269 )
2016-05-07 19:55:51 +02:00
ocornut
8b428e8c74
Added CreateContext/DestroyContext/GetCurrentContext/SetCurrentContext() ( #586 , #269 )
2016-05-07 19:54:27 +02:00
Sergej Reich
6e8579fc14
Ignore implicit conversion warnings
2016-05-07 18:49:24 +02:00
ocornut
69cc00f91f
ImGuiStorage: Added bool helper functions for completeness.
2016-05-07 18:18:37 +02:00
ocornut
313d388bba
Reorganised windows moving code, documented a lag in FindHoveredWindow(), fixing lag whole moving windows ( #635 )
2016-05-06 11:31:32 +02:00
ocornut
67df0ba185
Updated FAQ and Readme with more prominent info about WantCaptureMouse etc. flags ( #635 )
2016-05-06 09:18:07 +02:00
ocornut
f22b6e1e09
Fixed/silenced various absurd GCC warnings from outer space ( #626 )
2016-05-04 23:28:16 +02:00
ocornut
79ad22e1f2
Fixed various Clang -Weverything warnings ( #626 )
2016-05-04 23:17:53 +02:00
ocornut
efedaa5df3
Updated FAQ ( #628 )
2016-05-04 20:49:17 +02:00
ocornut
9b79327673
BeginGroup() fixed using within Columns set ( fix #630 )
2016-05-04 20:22:57 +02:00
ocornut
0058492156
Fonts readme, refering to IconFontCppHeaders, AddRemapChar() function, etc.
2016-05-04 17:20:11 +02:00
ocornut
89d5026187
Renamed majority of use of "opened" to "open" for clarity. Renamed SetNextTreeNodeOpened() to SetNextTreeNodeOpen(). ( #625 , #579 )
2016-05-02 12:32:16 +02:00
Anton Holmberg
4f34ed5010
Fix typo in Programmer guide
2016-05-01 16:18:31 -07:00
ocornut
4170b4847d
Style: Changed default IndentSpacing from 22 to 21 ( #581 , #324 )
2016-05-01 23:49:10 +02:00
ocornut
13df4668d1
Added GetTreeNodeToLabelSpacing() helper - tentative name ( #581 , #324 )
2016-05-01 23:47:58 +02:00
ocornut
b93040e600
TreeNode: minor tidying up ( #581 , #324 )
2016-05-01 23:46:48 +02:00
ocornut
bb674ccee6
TreeNode: added ImGuiTreeNodeFlags_AlwaysOpen flag ( #581 , #324 )
2016-05-01 21:15:46 +02:00
ocornut
9733f4fa24
Internal RenderBullet() helper.
2016-05-01 20:19:28 +02:00
ocornut
f79b2d6ce3
TreeNode: added ImGuiTreeNodeFlags_OpenOnArrow flag ( #581 , #324 , #190 )
2016-05-01 20:12:14 +02:00
ocornut
df764c21d6
Bullet(), BulletText(): slightly bigger. less polygons
2016-05-01 20:04:48 +02:00
ocornut
470b88e965
ButtonBehavior(): ImGuiButtonFlags_PressedOnDoubleClick clears active id on double-click so that multiple flags don't trigger multiple times
2016-05-01 20:02:25 +02:00
ocornut
4c880b7106
Added ImGuiTreeNodeFlags_OpenOnDoubleClick ( #581 , #516 , #190 )
2016-05-01 17:46:08 +02:00
ocornut
a38fd2e186
Added TreeNodeEx() functions ( #581 , #600 , #190 )
2016-05-01 17:45:31 +02:00
ocornut
547f34cf22
Refactor ButtonBehavior(), fixed double-click mode also triggering on single-click (relate to #516 )
2016-05-01 17:43:51 +02:00
ocornut
ac501102fc
Added IsItemClicked() helper ( #581 )
2016-05-01 17:43:17 +02:00
ocornut
ec6471ca87
TreeNodeEx() wired the display-side ImGuiTreeNodeFlags_Selected flag ( #581 )
2016-05-01 16:06:46 +02:00
ocornut
ab6bc05fc3
Fixed ImGuiTreeNodeFlags_AllowOverlapMode to behave better on touch-style inputs ( #600 )
2016-05-01 15:44:50 +02:00
ocornut
df749e3f13
Added CollapsingHeader() variant with close button, obsoleted 4 parameters version. Refactored code into TreeNodeBehavior. ( #600 )
...
New flag and declaration makes uses of SetNextTreeNode() functions on
collapsing header more obvious as well (#579 ).
2016-05-01 14:34:55 +02:00
ocornut
befe02559a
Added IsRootWindowOrAnyChildHovered() helper ( #615 )
2016-05-01 12:14:07 +02:00
ocornut
60d6c6d0e8
Comments/tweaks on ItemAdd()
2016-05-01 11:46:49 +02:00
ocornut
7406d64c64
PushClipRect(): not altering passed values, leave it to caller responsibility to floor properly (followup #582 )
2016-04-30 18:55:23 +02:00
ocornut
819cc414b1
Metrics window: uses IM_COL32() macro to generate constant colors.
2016-04-28 10:25:23 +02:00
ocornut
c5149cd53c
MenuItem(): checkmark render in disabled color when disabled
2016-04-27 23:34:24 +02:00
ocornut
be7621f7c5
Updated FAQ about non UTF-8 literal ( #609 , #613 )
2016-04-26 19:23:36 +02:00
ocornut
544ba36bf6
Fixed GetFrontMostModalRootWindow() ( #604 )
2016-04-26 11:59:56 +02:00
ocornut
6bcc31e575
Merge branch 'master' into 2016-02-colorpicker
2016-04-26 11:06:24 +02:00
ocornut
ea6b615179
Made ImGui::PushClipRect()/PopClipRect() public. Changed ImDrawList::PushClipRect() prototype. Fixed demo. ( #610 )
2016-04-26 11:03:51 +02:00
ocornut
4b6e9ac396
ImFont: Added AddRemapChar() helper ( #609 )
2016-04-26 10:08:06 +02:00
ocornut
247da0e01b
BeginGroup() comment tweaks ( #608 )
2016-04-25 08:45:32 +02:00
ocornut
4b51e43d60
BeginGroup() extra comment because this is overused and misleading ( #608 )
2016-04-24 22:52:07 +02:00
ocornut
919eb69931
Scrollbar: minor fix for top-right rounding of scrollbar background when window has menubar but no title bar
2016-04-24 22:38:30 +02:00
ocornut
7da2d51480
MenuBar fixed missing lower border
2016-04-24 22:36:46 +02:00
ocornut
a753aff07a
Moved Bullet*() code below TreeNode*() code.
2016-04-24 19:38:37 +02:00
ocornut
a0c411ffd2
Fixed typos in previous commit 1884f550bc ( #582 , #597 ))
2016-04-23 14:40:43 +02:00
ocornut
1884f550bc
Fixed clipping rectangle floating point representation to ensure renderer-side ops yield correct results ( #582 , 597)
2016-04-23 14:22:41 +02:00
ocornut
41215534d5
Internal ImRound() -> ImFloor(), ImRect::Round() -> ImRect::Floor(),
2016-04-23 14:10:36 +02:00
ocornut
44fb99542f
ImFont: RenderText() useful directly without ImDrawList::AddText().. Changed prototype. Reserving vertices after skipping non-visible lead.
2016-04-23 11:09:56 +02:00
ocornut
29e259a43c
InputText() clipping cursor rendering in case it gets out of the box (which can be forced w/ ImGuiInputTextFlags_NoHorizontalScroll) ( #601 )
2016-04-22 08:38:56 +02:00
ocornut
7ce6c18bbe
Refactored CloseWindowButton() into a CloseButton() helper declared in imgui_internal.h ( #600 )
2016-04-21 09:55:02 +02:00
ocornut
fc3b8d0a56
Relative order of Child windows creation is preserved during sort ( #595 )
2016-04-19 18:31:25 +02:00
ocornut
006934fd15
Todo items + not using function called isblank() because it may be a macro in some C library
2016-04-12 22:36:51 +02:00
ocornut
074a6853c7
Moved comments
2016-04-09 19:13:02 +02:00
ocornut
77177c18f0
Merge branch 'master' into 2016-02-colorpicker
2016-04-09 19:12:03 +02:00
ocornut
1588eda1ac
Version 1.49 WIP
2016-04-09 19:10:42 +02:00
ocornut
95cbcdca3f
Version 1.48
2016-04-09 17:46:48 +02:00
ocornut
4c25de950c
Warning fixes for clang. Using int64_t, may be an issue?
2016-04-09 17:46:38 +02:00
ocornut
31852e1d05
Silence borderline warning with -Werror=strict-overflow
...
Error: assuming signed overflow does not occur when assuming that (X -
c) > X is always false [-Werror=strict-overflow]
2016-04-06 11:11:38 +02:00
ocornut
e808b7cfca
Style: removed WindowFillAlphaDefault which was confusing and redundant, baked into WindowBg color. Renamed TooltipBg > PopupBG. ( #337 )
...
bg_alpha parameter of 5-parameters version of Begin() is an override,
however that function may become obsolete someday.
2016-04-04 01:37:02 +02:00
ocornut
947171dcef
Fixed InputTextMultiLine(), ListBox(), BeginChildFrame(): outer frame not honoring bordering (following #462 )
2016-04-04 00:30:50 +02:00
ocornut
07df3cfb3e
Added ImGuiWindowFlags_AlwaysUseWindowPadding flag to ensure non-border child window uses window padding ( #462 )
2016-04-04 00:29:57 +02:00
ocornut
8e353af1d3
Renamed ImGuiWindowFlags_Force**Scrollbar to ImGuiWindowFlags_Always**Scrollbar ( #476 )
2016-04-03 23:28:05 +02:00
ocornut
f45fd1cef6
Comments
2016-04-03 16:42:35 +02:00
ocornut
4c1d4233b2
Merge branch 'master' into 2016-02-colorpicker
2016-04-03 01:10:26 +02:00
ocornut
650515ce49
Updated todo list and comments
2016-04-03 01:07:11 +02:00
ocornut
c61e08e8c4
InputText: move to next word OS X style behavior on OS X ( #473 )
2016-04-02 22:06:47 +02:00
ocornut
f48fc51777
IO: Added unused MultiSelectUsesSuperKey dummy field to convey semantic for OS X compatible behavior ( #473 )
2016-04-02 18:58:42 +02:00
ocornut
aa7a29cdbf
InputText(): Added io.DoubleClickSelectsWord option for OS X compatible behavior ( #473 )
2016-04-02 18:57:50 +02:00
ocornut
587fc60f25
InputText/IO: Added WordMovementUsesAltKey , ShortcutsUseSuperKey for OS X Compatible behavior ( #473 )
2016-04-02 18:57:08 +02:00
ocornut
9e817a7c38
ColorPicker3/4: Fixed missing ID scoping ( #346 )
2016-03-28 23:45:23 +02:00
ocornut
6a241d4895
ColorPicker3: Fixed
2016-03-28 23:38:04 +02:00
ocornut
326c4e40f8
Merge branch 'master' into 2016-02-colorpicker
2016-03-28 23:17:13 +02:00
ocornut
cfbf06e394
Comments and moved EndFrame() for imgui_internal.h (for clarity? or extra confusion?)
2016-03-27 10:38:14 +02:00
ocornut
2b7eeba143
Trim trailing spaces
2016-03-26 15:38:52 +01:00
ocornut
d6750c87c2
Combo: display popup above if there's isn't enough space below / or select largest side ( #505 )
2016-03-25 23:36:43 +01:00
ocornut
7c9fa59329
Combo: Right-most button stays highlight when popup is open.
2016-03-25 22:55:45 +01:00
ocornut
aecf5d12e6
DragFloat(), SliderFloat(), InputFloat(): fixed cases of erroneously returning true repeatedly after a text input modification ( #564 )
2016-03-25 21:53:59 +01:00
ocornut
5b8aa0dc84
FAQ and comments about the use of ImTextureID ( #562 , #561 , #521 , #510 , #497 , #475 )
2016-03-24 11:06:57 +01:00
ocornut
04396ed7a9
FAQ and comments about the use of ImTextureID ( #562 , #561 , #521 , #510 , #497 , #475 ...)
2016-03-24 11:00:47 +01:00
ocornut
d39029f3a8
Branch fix
2016-03-23 10:51:40 +01:00
ocornut
baabe3b62c
Merge branch 'master' into 2016-02-colorpicker
2016-03-23 10:50:37 +01:00
ocornut
367c53967f
Metrics: inspect individual triangles in drawcall
2016-03-22 21:17:24 +01:00
ocornut
37d50dccf9
Added GetFontTexUvWhitePixel() helper.
2016-03-21 22:30:32 +01:00
ocornut
a274a09955
Renamed GetWindowFont()->GetFont(), GetWindowFontSize()->GetFontSize() (related to #340 )
2016-03-21 22:29:11 +01:00
ocornut
928832a5bc
Various tidying up / comments, moved columns functions declarations, no functional changes
2016-03-21 22:11:43 +01:00
omar
8e8e59a942
Merge pull request #555 from DMartinek/patch-1
...
CheckboxFlags: Added support for passing/testing multiple flags at the same time.
2016-03-21 13:09:55 -07:00
Kyle Rocha
3f46d9b933
Renamed FindTextDisplayEnd to FindRenderedTextEnd
2016-03-21 12:33:48 -07:00
Kyle Rocha
5bffc85ba6
Exposed FindTextDisplayEnd to imgui_internal.h
2016-03-21 12:07:13 -07:00
Daniel Martinek
37716184b3
Fixed coding style.
2016-03-18 16:49:19 +01:00
Daniel Martinek
5abb39cb1f
Added support for CheckboxFlags that can set multiple flags at the same time.
2016-03-18 14:02:14 +01:00
ocornut
4b7edffe8a
Comments
2016-03-08 20:54:21 +01:00
ocornut
9ea093ddd0
DragFloat(): always apply value when mouse is held/widget active, so that can use a drag over an always-reseting value
2016-03-07 13:12:15 +01:00
ocornut
459af7683c
Merge branch 'master' into 2016-02-colorpicker
2016-03-04 13:57:33 +01:00
ocornut
3db40903ba
InputText() ImGuiInputTextFlags_CallbackAlways event set the EventFlag field of ImGuiTextEditCallbackData ( #541 )
2016-03-04 13:07:42 +01:00
ocornut
b816d05e33
Minor tidying up following ( #516 ) - renamed ImGuiSelectableFlags_HandleDoubleClick to ImGuiSelectableFlags_AllowDoubleClick + comments
2016-03-03 00:30:08 +01:00
ocornut
6846873f23
Merge branch 'master' of https://github.com/zapolnov/imgui into zapolnov-master
2016-03-03 00:18:58 +01:00
ocornut
d45044fe54
CaptureKeyboardFromApp() / CaptureMouseFromApp(): allow to enforce clearing the capture flag ( #533 ) + demo + made code a little less messy
2016-03-03 00:09:41 +01:00
ocornut
cf12bc7dea
InputText: Added BufTextLen in ImGuiTextEditCallbackData. Requesting user to maintain it. Zero-ing structure properly before use. ( #541 )
2016-03-02 23:34:29 +01:00
ocornut
17d3c202ac
BeginChild()/EndChild() fixed incorrect layout to allow widgets submitted after an auto-fit child wnidow ( #540 )
2016-03-02 21:46:23 +01:00
ocornut
1881cbe860
TextUnformatted: Fixed rare crash bug with large blurb of text (2k+) not finishing with a '\n' and fully above the clipping Y line. ( #535 )
2016-02-24 22:43:17 +01:00
ocornut
a43a9e602a
ColorEdit4: support ImGuiColorEditFlags_NoSliders to display only a button (wip #346 )
2016-02-21 23:55:01 +01:00
ocornut
f8fede1d8b
Added ColorPicker3/ColorPicker4, refactoring ColorEdit3/ColorEdit4 adding a bunch of flags and access to picker (wip #346 )
...
Still pretty much experimenting so may break API
2016-02-21 23:23:30 +01:00
ocornut
d1061c8799
Exposed FindWindowByName() in imgui_internal.h (missing chunk following 339b67c01a)
2016-02-21 18:10:35 +01:00
ocornut
339b67c01a
Exposed FindWindowByName() in imgui_internal.h
2016-02-20 17:37:36 +01:00
ocornut
20ba769644
Allow windows with only a callback only to be functional + minor cleanup ( #524 )
2016-02-14 10:33:56 +01:00
ocornut
5b7a0b1b40
InputText() added comment ( #526 )
2016-02-11 23:00:14 +01:00
ocornut
dafedc3246
Demo: use locally defined strdup because compilers/standard librairies are an annoyance ( #520 )
2016-02-08 08:44:45 +01:00
Nikolay Zapolnov
a908c109c0
Added flag for selectables to handle double clicks.
2016-01-31 22:08:35 +01:00
ocornut
62fe0b59bf
Updated todo list
2016-01-30 18:34:19 +01:00
ocornut
2efaa9a86f
ImDrawList: fixed index overflow check broken by AddText(). Added extra assert. ( #514 )
2016-01-30 17:01:10 +01:00
ocornut
a3b00b79f2
Fixed removal of trailing draw command if it is a callback command
2016-01-30 16:37:30 +01:00
ocornut
b671840d15
InputTex(): Comment ( #512 )
2016-01-30 15:00:45 +01:00
ocornut
b1ec90d565
InputText() fixed clipping bounds of contents ( #512 )
2016-01-30 14:57:24 +01:00
ocornut
595684e08c
Remove dependency on <new> header ( #484 , #504 )
...
(Now expecting something to fail somewhere..)
2016-01-25 21:26:53 +00:00
ocornut
3ee50af57e
Fixed clipping of child windows within parent not taking account of childouter clipping boundaries (including scrollbar, etc.) ( #506 )
2016-01-25 20:55:34 +00:00
ocornut
005b897d7d
ProgressBar() handling of border size + storing border size in window structure ( #503 )
2016-01-24 11:00:37 +00:00
ocornut
9f6b1ace8f
Tidying up internal FindBestPopupWindowPos()
2016-01-23 15:13:55 +00:00
ocornut
94dc3df956
ColorEdit4: Empty label doesn't add InnerSpacing, like other widgets (ref #346 )
2016-01-23 14:57:48 +00:00
ocornut
570a9dadc4
Honoring exact width passed to PushItemWidth(), previously it would add extra FramePadding.x*2 over that width. (ref #346 )
...
If you had manual pixel-perfect alignment in place it might affect you.
2016-01-23 12:07:26 +00:00
ocornut
8f0f71c7ba
InputScalarEx(): removed unnecessary aabb computation.
2016-01-23 11:56:39 +00:00
ocornut
2a505ebb9a
ColorEdit4(): removed unnecessary calls to scanf() when idle in hexadecimal edit mode.
2016-01-23 11:29:22 +00:00
ocornut
56927cbb54
Begin(): made the close button explicitly set the boolean to false instead of toggling it ( #499 )
2016-01-22 10:00:32 +00:00
ocornut
e585204d82
ImFontAtlas: heuristic increase texture width up to 4096 with 4000+ glyphs. Various comments ( #491 )
2016-01-20 10:30:28 +00:00
ocornut
3922988dea
TreeNode(), CollapsingHeader() fixed not being to use "##" sequence in formatted label.
...
Removed DisableHideTextAfterDoubleHash hack used by Metrics window.
2016-01-16 12:25:40 +00:00
ocornut
739e73b07b
CalcTextSize(): adding early out for empty displayed string ( #487 )
2016-01-16 12:11:57 +00:00
ocornut
fc66365805
Added overlooked test for label_size.x>0 before calling RenderText for label in a few instances ( #487 )
2016-01-16 12:01:18 +00:00
ocornut
85725ff9c6
Added ImGuiWindowFlags_ForceVerticalScrollbar, ImGuiWindowFlags_ForceHorizontalScrollbar flags ( #476 )
2016-01-10 12:01:56 +00:00
ocornut
749e8fa345
Minor optimization so that mass-calling BeginPopupContext* functions can early out more commonly without hashing ID
2015-12-31 12:11:28 +01:00
ocornut
4e3c6f64c0
Various minor fixes following a pass of cppcheck static analyzer
2015-12-30 11:45:13 +01:00
ocornut
d212401624
Fixed ImDrawList::AddRect() which used to render a rectangle 1 px too large on each axis., fixed Image(), ImageButton() as well ( #457 )
2015-12-27 21:31:43 +01:00
ocornut
dc4a07c49a
Fixed various Clang -Weverything warnings
2015-12-26 14:59:07 +01:00
ocornut
e41568f87f
Version number 1.48 WIP + Update binaries
2015-12-26 10:02:57 +01:00
ocornut
24d186753e
Version number 1.47
2015-12-25 22:44:03 +01:00
ocornut
1c5aa32d2b
TODO items. Moved ImDrawList::Clear* methods suggesting they aren't for end-user.
2015-12-25 17:41:45 +01:00
ocornut
e4cf44e967
Minor rebranding "ImGui" -> "dear imgui" ( #21 )
2015-12-24 20:00:50 +01:00
ocornut
25c9448dda
imconfig.h tweak, not advertising IMGUI_INCLUDE_IMGUI_USER_INL anymore.
2015-12-24 20:00:49 +01:00
ocornut
f3b41b35c2
Initial creation of a ImGuiWindowFlags_NoBringToFrontOnFocus window push it at the front of global window list
2015-12-24 14:55:42 +01:00
ocornut
40ddf8e287
Exported high-level versions of PushClipRect / PopClipRect to imgui_internal.h ( #448 )
2015-12-24 14:47:11 +01:00
ocornut
fc7a3d07bb
BeginPopupContextItem: fixed comment ( #439 )
2015-12-21 17:21:16 +01:00
ocornut
4723d97cfb
Added BeginPopupContextItem() comment ( #439 )
2015-12-21 00:04:33 +01:00
ocornut
6102aa1375
BeginPopupContextWindow() and BeginPopupContextVoid() reopen window on subsequent click ( #439 )
2015-12-20 23:39:47 +01:00
ocornut
2e5577f44f
Fix for popups being incorrectly positioned if their contents are larger than display and WindowPadding < DisplaySafeAreaPadding
2015-12-17 12:22:50 +00:00
ocornut
0873da85ec
ImDrawList: Fixed bug with PopClipRect() sometimes altering TextureId + fixed merging of draw calls with same TextureId
2015-12-16 01:01:34 +00:00
ocornut
370de414ef
TreeNode(): Fixed horizontal spacing for layout to match Bullet() (followup to #414 , #282 )
2015-12-13 23:42:44 +00:00
ocornut
2e5352786a
Bullet(), BulletText(): vertical and horizontal alignment fixes (namely for widget sized line height). (followup to #414 , #282 )
2015-12-13 23:41:02 +00:00
ocornut
558430ca8f
TreeNode() fixed alignment of collapse arrow to it matches bullet (broken in 4006fb77bc)
2015-12-13 22:07:01 +00:00
ocornut
5084f90a0d
Added ProgressBar() ( #333 )
2015-12-13 21:41:45 +00:00
ocornut
9b6b1bc0f3
Added GetColorU32 helpers (previously internal and misplaced as window->Color())
2015-12-13 19:32:37 +00:00
ocornut
7b0bf23071
Ensure that individual widgets are pixel aligned when using non pixel snapped font rendering.
2015-12-13 17:12:35 +00:00
ocornut
56c4f5b7dc
MenuBar clipping rectangle fix for bordered mode
2015-12-13 16:03:52 +00:00
ocornut
b49a985324
Various adjustment for border to be inside instead of outside the window size
2015-12-13 16:01:25 +00:00
ocornut
b1b759938e
Fixed SizeContents and auto-fit size not being rounded to integer, which affects border rendering when using non-default font
2015-12-13 12:52:55 +00:00
ocornut
6c7f8efe1e
InputText: update mouse drag on mouse move only & key input reposition selection bounds (better fix for #429 )
2015-12-11 22:37:47 +00:00
ocornut
4bfd5cd95f
InputText: when keys are being input while mouse is dragging, disable mouse drag until button release ( #429 )
2015-12-11 22:20:16 +00:00
ocornut
de4ae2d53a
Metrics: computing drawcmd bounding box handle case where buffer has been de-indexed.
2015-12-05 11:26:47 +00:00
ocornut
5dec997fbe
Minor tidying up of now redundant code
2015-12-04 23:41:24 +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
ecc97bda7d
Added SetItemAllowOverlap() exposed in imgui_internal.h only
2015-12-03 21:30:17 +00:00
ocornut
632f9ec36a
Commenting asserts
2015-11-30 09:45:45 +00:00
ocornut
5f8200d52c
TreeNode/CollapsingHeader: some minor cleanup of that horrible function.
2015-11-29 22:38:58 +00:00
ocornut
d1b4159b51
TreeNode/CollapsingHeader: some minor cleanup of that horrible function.
2015-11-29 22:25:13 +00:00
ocornut
9dca2ca960
Comments & spacing
2015-11-29 22:01:26 +00:00
ocornut
b7e1ae4bf9
Added comment on using PushFont() before building the font ( #232 )
2015-11-29 21:33:51 +00:00
ocornut
4006fb77bc
TreeNode,CollapsingHeader: sizing fixes to support laying out item on same line before/after ( #414 , #282 )
2015-11-29 20:35:58 +00:00
ocornut
546962351b
Internal minor renaming
2015-11-29 20:27:48 +00:00
ocornut
6269859315
Replace OS IME (Input Method Editor) cursor on top-left when we are not text editing.
2015-11-29 14:15:07 +00:00
ocornut
5c52e9ec0d
Examples: Clarified comments. Removed font merging example from comments.
2015-11-29 11:11:03 +00:00
ocornut
9735563b65
Additional comments for new users
2015-11-29 10:53:03 +00:00
ocornut
ba77166432
Demo: comments ( #414 )
2015-11-28 17:23:32 +00:00
ocornut
4ca34a879d
Columns: Fixed bug with indentation within columns, also making code shorter/faster ( #414 , #125 )
2015-11-28 16:36:25 +00:00
ocornut
a9009b133c
Columns: Undo accidental change from 807d4ff92c
2015-11-28 15:52:57 +00:00
ocornut
e4ba6e525b
Columns:: columns set with no implicit id include the columns count into the id to avoid collisions ( #125 )
2015-11-28 15:35:10 +00:00
ocornut
807d4ff92c
Columns: minor tidying up while investigating severe issues with indenting within columns ( #414 )
2015-11-28 12:14:50 +00:00
ocornut
58b23b4785
Columns: avoid growing ColumnsData vector when closing a window with no columns ( #125 )
...
(Will break calling GetColumnOffset() when there's no column but it
would only have worked after the first frame anyway, so basically it
didn't work)
2015-11-26 23:07:10 +00:00
ocornut
1aac69c937
Columns: tidying up, moving OffsetT to a ImGuiColumnData structure
2015-11-26 23:01:15 +00:00
ocornut
3102c0c97e
Rename internal ColumnsStartX to IndentX, makes more sense
2015-11-26 22:43:21 +00:00
ocornut
92c518a420
InputText: Added password mode via ImGuiInputTextFlags_Password ( #237 , #363 , #374 )
2015-11-19 23:09:59 +01:00
ocornut
693efccb62
ImageButton() uses FrameRounding up to a maximum of available framing size ( #394 )
2015-11-15 19:43:05 +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
9243aee62c
Fixed unused variable warning if asserts are compiled out.
2015-11-11 10:26:12 +00:00
Jason Wilkins
4dee8473b5
Fixed a couple of problems found by CppCat code analyzer.
...
* incorrect implementation of ImVec4 operator- which always gives a w value of 0
* boolean formula of ((A && B) || B) can be simplified to just (B)
2015-11-10 17:06:37 -06:00
ocornut
e4fb14a9e0
TODO notes
2015-11-08 11:00:56 +00:00
ocornut
4982cd136e
Fixed Shutdown() not clearing FontAtlas if NewFrame() was never called. ( #396 , #303 )
2015-11-07 23:10:09 +00:00
ocornut
1a42a3f91b
Refactor internal SliderBehavior() to take flags instead of a bool.
...
Sorry!
2015-10-30 11:43:23 +01:00
ocornut
3eabad0321
Refactor - Internal ButtonBehavior() removed unnecessary boolean arg, merged into flags using ImGuiButtonFlags_NoKeyModifiers.
...
This is quite a risky change frankly but I'd rather refactor sooner than
later. Hopefully few people are using the internal functions.
2015-10-30 11:36:51 +01:00
ocornut
217ef444d4
ColorEdit4: Fixed broken tooltip on hovering the color button (actually fixes #373 , #380 )
2015-10-19 12:02:52 +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
fbdcb51dde
Fix to allow using SetNextWindow* functions with ImGuiSetCond_Appearing on modal windows ( #377 )
...
Also affect other popups which called FindBestPopupWindowPos() on their
second frame but it most often acts as a no-op but it wouldn't be
noticeable.
2015-10-18 17:30:53 +01:00
ocornut
8b9c0b2545
Tweaks (calling inner SetNext* functions directly from Begin)
2015-10-18 17:20:03 +01:00
ocornut
7a61b7dd57
Renamed Window LastFrameDrawn to LastFrameActive, more correct
2015-10-18 16:57:10 +01:00
ocornut
465e6839a4
ColorEdit4: hovering the color button shows correct alpha ( fix #373 )
2015-10-18 16:24:44 +01:00
ocornut
5b7a2149fc
ColorConvertFloat4ToU32() round the floats instead of truncating them.
2015-10-18 16:09:37 +01:00
ocornut
43ff5a41be
InputText(): always use live input data for display in read-only mode ( fix #360 )
2015-10-18 15:50:46 +01:00
ocornut
a0d24ac03d
Scrollbar: background color less translucent in default style (flattened alpha) so it works better on non-WindowBg colored background.
2015-10-18 15:36:39 +01:00
ocornut
64b6e87f54
Scrollbar: fixed vertical alignment with border + no menu bar (following #365 )
2015-10-18 15:35:27 +01:00
ocornut
b090d711e2
InputText: removed the need for text_end pointer in the cursor position calculation loop, allows switching buffers
2015-10-18 15:25:36 +01:00
ocornut
214e87d59c
InputText: comments.
2015-10-18 12:18:28 +01:00
ocornut
bc34ac882f
InputText: added comments and somehow clarified the optimized code that calculate text position + updated demo
2015-10-18 10:57:29 +01:00
ocornut
d4d2e5bc62
Added items to Todo list
2015-10-12 12:31:41 +02:00
ocornut
a5c895f791
Added SetClipboardText / GetClipboardText helper shortcuts to match MemAlloc / MemFree
2015-10-12 12:20:01 +02:00
ocornut
8eb4df0dd6
Added comments ( #369 #370 )
2015-10-11 17:20:07 +02:00
richardk
8a6bde3527
Fix for AltGR being send as Ctrl&Alt on german keyboards. Don't consume characters if CTRL key press is detected AND ALT key press is detected in Imgui::InputTextEx
2015-10-11 16:25:49 +02:00
ocornut
fae7b34a3f
Fixed bug with handling of malformed utf-8 at the end of a non-zero terminated string range.
2015-10-09 21:47:41 +02:00
ocornut
b8281d96bd
Fixed mouse release double-triggering ( #359 , #362 )
2015-10-08 20:59:49 +02:00
ocornut
de92bc873f
Scrollbar: fixed minor rendering offset when borders are enabled ( fix #365 )
2015-10-08 20:25:49 +02:00
ocornut
bd78892164
Fixed IsKeyReleased() and IsMouseReleased() returning true on the first frame.
...
Loosely related to #362
2015-10-08 15:28:09 +02:00
ocornut
e83b529846
BeginChildFrame() helper has the extra_flags parameter.
2015-10-07 00:22:44 +02:00
ocornut
d087671369
HoveredId is set via a SetHoveredID() function. Added HoveredIdAllowHoveringOthers not used by default API.
2015-10-06 19:27:24 +02:00
ocornut
06d594e86b
Dummy() create an item so functions such as IsItemHovered() can be used.
2015-10-05 20:27:22 +02:00
ocornut
54805fd22a
InputText: fixed crash when passing a buf_size==0 (which can be of use for read-only selectable text boxes) ( #360 )
2015-10-05 14:13:24 +02:00
ocornut
e031fe484c
Added ImGuiWindowFlags_NoBringToFrontOnFocus behavior.
2015-10-02 19:07:04 +02:00
ocornut
f21fda1231
Scrollbar: Tweaked scrollbar inner padding for small scrollbars.
2015-09-30 21:47:44 +02:00
ocornut
6e4d959953
Window: fixed window lower-right clipping limit so it plays more friendly with both OpenGL and DirectX coordinates.
...
Not sure about this. Hmm.
2015-09-30 21:30:27 +02:00
ocornut
c9d51d99b4
Scrollbar: tidying up ( #355 )
2015-09-30 21:19:54 +02:00
ocornut
b92daf0ba2
Scrollbar: fixed rounding of background + child window consistenly have ChildWindowBg color under ScrollbarBg fill ( #355 )
2015-09-30 21:15:17 +02:00
ocornut
a76b75c2d5
InputFloat() fixed explicit precision modifier, both display and input were broken.
2015-09-30 15:36:17 +02:00
ocornut
ab5def6ad8
PlotHistogram: Minimum bar width ensure better rendering with lots of points (~related to #342 )
2015-09-20 12:02:17 +02:00
ocornut
e268303c02
PlotLines: fixed rendering issue added in previous commit ( #342 )
2015-09-20 11:37:46 +02:00
Mikulas Florek
93200a6c37
fixed rendering of histogram with a lot of values
2015-09-19 21:12:26 +02:00
ocornut
fee9e07e61
Updated FAQ ( #341 )
2015-09-19 15:22:05 +02:00
ocornut
ff12afbd18
InputText(): fixed cursor pixel-alignment when horizontally scrolled.
2015-09-19 13:48:27 +02:00
ocornut
0e86ed9361
InputText(): fixed mouse-dragging not scroll tracking the cursor when text doesn't fit ( fix #339 )
2015-09-19 13:45:51 +02:00
ocornut
08bfe9bc7c
Fixed assert introduced in 3b01b0a2f2
2015-09-18 15:03:44 +02:00
ocornut
c4562ac573
Fixed mouse click detection to be more friendly to DeltaTime 0.0 ( #338 )
2015-09-17 23:42:34 +01:00
ocornut
3b01b0a2f2
Extracted a EndFrame() function out of Render() but kept it internal/private + clarified some asserts ( #335 )
2015-09-16 23:48:42 +01:00
ocornut
0a1d6b6b74
InputText() fixed ignoring text inputs when ALT is pressed ( #334 )
2015-09-16 10:38:42 +01:00
ocornut
ec7eb05e88
ImGuiTextFilter::Draw helper return bool and resplit when filter is modified
2015-09-14 13:03:20 +01:00
ocornut
f9928e96c7
InputText(): lose cursor/undo-stack when reactivating focus is buffer has changed size
2015-09-12 00:02:59 +01:00
ocornut
7b1168eb30
Internal ImLoadFileToMemory() return void* instead of taking void** + allow optional int* file_size
2015-09-11 16:01:54 +01:00
ocornut
1793c1a991
Comments
2015-09-09 14:15:17 +01:00
ocornut
cafe8b0cd7
Comments
2015-09-09 12:42:59 +01:00
ocornut
fcbbb0070e
Fixed assert introduced in dafad3903e if there are no active draw list
2015-09-09 12:39:16 +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
93f9ad9ddf
README.md
2015-09-05 20:03:05 +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
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
71026d3655
Added GetScrollX(), GetScrollX(), GetScrollMaxX() apis + demo ( #246 )
2015-08-30 18:33:38 +01:00
ocornut
7a31030978
Begin() windows flags are locked on the first begin of the frame, allowing using to not bother passing flags for append
2015-08-30 18:30:54 +01:00
ocornut
bbf09fd47d
Fixed initial ScrollbarX decision when no vertical scrollbar is in ( #246 )
2015-08-30 18:07:04 +01:00
ocornut
a3cad2ff06
BeginChild() fixed missing rounding for child sizes which leaked into layout
2015-08-30 18:06:54 +01:00
ocornut
6eed3dc7c8
GetContentRegionMax() when window content size is explicit we don't adjust it with scrollbar sizes ( #246 )
2015-08-30 17:46:02 +01:00
ocornut
73e73e6ef9
TextUnformatted(): simplifying
2015-08-30 17:45:05 +01:00
ocornut
e1f8fed734
Separator(): removed unnecessary computation + comment.
2015-08-30 17:25:26 +01:00
ocornut
f128a8bce1
ColumnsStartX include window->Scroll.x to simplify code ( #246 )
2015-08-30 17:25:10 +01:00
ocornut
8edbdb9775
Style: minor menubar bg alpha tweak.
2015-08-30 16:44:44 +01:00
ocornut
e68d3c614e
Style: made scrollbars rounded by default. Because nice. ( #246 )
2015-08-30 16:43:08 +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
9eed672725
Bullet() fixed inconsistent layout behaviour when clipped.
2015-08-30 15:42:42 +01:00
ocornut
d88b73a8b7
Added GetContentRegionAvailWidth() helper. Demo tweaks.
2015-08-30 15:35:59 +01:00
ocornut
fc13ae2aa5
Turning float ScrollY into ImVec2 Scroll - no feature change, this is just to remove some syntax noise from the following commit ( #246 )
2015-08-30 15:08:13 +01:00
ocornut
e0c375e7b8
Tidying up
2015-08-30 13:09:56 +01:00
ocornut
b326c8fd1f
Added GetCurrentWindowRead() for functions that don't write to the window
2015-08-30 11:56:04 +01:00
ocornut
b994dd777a
Fixed OpenPopup() accessing current window, effectively opening "Debug" on an empty window stack
2015-08-30 11:11:15 +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
64fcb5e568
TreeNode() fixed IsItemHovered() being inconsistent with visual behavior ( #282 )
2015-08-29 18:15:42 +01:00
ocornut
65fe60f2b2
Split tree/collapsable into internal TreeNodeBehaviorIsOpened() helper (unsure..) ( #282 )
2015-08-29 18:13:30 +01:00
ocornut
c381d58fb1
TreeNode(): arbitrary interaction padding after text label not part of layout ( #282 )
2015-08-29 14:12:53 +01:00
ocornut
0a11024459
IO.WantInputCharacters -> WantTextInput ( #305 )
2015-08-28 15:34:53 +01:00
ocornut
b803d284c3
InvisibleButton() honor negative size consistently with other widgets that do so
2015-08-28 14:18:50 +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
8b225923f8
Malformed UTF-8 don't terminate string, output 0xFFFD ( #307 )
2015-08-27 13:44:31 +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
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
ad00d88923
Window clipping rect fixes (for child windows with borders among others)
2015-08-25 15:01:33 +01:00
ocornut
f0aca186cc
Comments
2015-08-25 13:35:25 +01:00
ocornut
ad3c9f620d
Tabs to spaces
2015-08-25 12:40:40 +01:00
ocornut
466f01b313
Fixed child windows with the ImGuiWindowFlags_NoMove flag not taking direct focus
2015-08-25 12:39:44 +01:00
ocornut
43d073db1e
Metrics: showing some internal state
2015-08-25 12:22:30 +01:00
ocornut
b76353bbb1
Passing ImGuiWindowFlags_NoMove to BeginChild() allows to inhibit moving root window from this child
2015-08-25 11:54:13 +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
b28858b33b
InputText: intentionally ignore character input when ctrl/alt are held (not sure if correct) ( #279 )
2015-08-21 00:24:47 +02:00
ocornut
bbced3f0f0
Build fix
2015-08-18 19:31:44 -06:00
ocornut
4ac4d1ac37
ImHash: defaults seed to zero + comment.
2015-08-18 19:17:09 -06:00
ocornut
97be3428f1
Added GetMousePosOnOpeningCurrentPopup().
2015-08-15 15:10:07 -06:00
ocornut
ede5956b28
Metrics window: shows indices along with triangles count ( #299 )
2015-08-13 22:33:33 -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
42567a9516
ImGuiTextFilter::PassFilter() supports string range. Added [] helper to ImGuiTextBuffer.
2015-08-13 21:25:32 -06:00
ocornut
72d3fca52f
Demo: added simple Log demo
2015-08-13 20:59:37 -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
915b46f1c1
Added assert on index overflow ( #292 )
2015-08-09 11:05:38 -06:00
ocornut
48ed0a10d7
Minor code compaction (following #296 )
2015-08-09 10:54:28 -06:00
Thomas Pöchtrager
3604aecf8f
Minor Windows adjustments
2015-08-09 17:24:10 +02: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
27961401c6
Cleanup ( #219 )
2015-08-06 08:37:51 -06:00
ocornut
88a00f77e9
Cleanup - using ImRect more consistently for ImGui-side cliprect data
2015-08-06 08:23:05 -06:00
ocornut
f1fb62fa6d
Cleanup - shuffle functions around ( #219 )
2015-08-06 08:11:33 -06:00
Jonathan Adamczewski
0911597550
Remove inline qualifiers inside .cpp
...
Use of inline in the .cpp file causes link errors with gcc.
2015-08-07 15:41:22 -07:00
ocornut
15cfa63e97
Comments
2015-08-05 19:09:13 -06:00
ocornut
692a38c0fc
Merge branch 'master' into 2015-07-cleanup
2015-08-05 17:41:43 -06:00
ocornut
f2b652a39e
Comments
2015-08-05 17:38:17 -06:00
ocornut
e7f1e28b6b
Merge branch 'master' into 2015-07-cleanup
2015-08-05 17:27:47 -06:00
ocornut
4b4f6d78ee
InputFloat() fixed 0 decimal_precision
2015-08-05 17:26:04 -06:00
ocornut
a54995eace
RoundScalar() fallback use powf(10.f, -x) instead of 1.0f/powf(10.0f,x)
2015-08-05 17:11:20 -06:00
ocornut
9b19f8c19d
Merge branch 'master' into 2015-07-cleanup
...
Conflicts:
imgui.cpp
2015-08-05 16:57:31 -06:00
ocornut
f6e21b7ab7
InputInt() also hexadecimal input (awkwardly via ImGuiInputTextFlags_CharsHexadecimal but we will allow fmt string in InputInt* later)
...
+ Fix for large ints constant assignment
2015-08-05 16:47:46 -06:00
ocornut
cc8ff4c8d1
RoundScalar() use a lookup table to avoid calling powf(10.0f, x);
2015-08-05 16:17:11 -06:00
ocornut
f0f2afa87d
InputInt() doesn't cast to float, fix handling lost of precision with large integer. Added primitives to support more data types.
2015-08-05 16:08:53 -06:00
ocornut
a793ad682d
Merge branch 'master' into 2015-07-cleanup
...
Conflicts:
imgui.cpp
2015-08-05 15:29:38 -06:00
ocornut
ebd25cf1a3
Minor comments
2015-08-05 15:13:13 -06:00
ocornut
e20b90154c
Comments
2015-08-05 11:04:13 -06:00
ocornut
3ee2fac892
Slider: fixed using FramePadding between frame and grab visual. Scaling that spacing would look odd.
2015-08-05 11:00:00 -06:00
ocornut
e42bec5ba2
Fixed scaling of checkbox and radio button for the filling of "active" visual
2015-08-05 10:50:20 -06:00
ocornut
155873a6b0
Added GetContentRegionAvail() helper
2015-08-05 10:43:12 -06:00
ocornut
60b46cc712
Comment ( #219 )
2015-08-05 09:34:07 -06:00
ocornut
815d1d9be4
Merge remote-tracking branch 'origin' into 2015-07-cleanup
...
Conflicts:
imgui.cpp
2015-08-03 08:12:57 -06:00
ocornut
3aca446817
Added ImFontAtlas::AddFontFromMemoryCompressedBase85TTF()
2015-08-03 08:10:10 -06:00
ocornut
da3baebd43
Fixed lower-right resize grip hit box not scaling along with its rendered size ( #287 )
2015-08-02 09:15:36 -06:00
ocornut
4b29cc9e10
Exposed relevant functions in imgui_internal.h ( #219 )
2015-08-01 21:57:24 -06:00
ocornut
26a992c6f6
Updated to stb_truetype 1.07 (back to vanilla version as our minor changes are now in master & fix #280 )
2015-08-01 07:22:52 -06:00
ocornut
6c63d80aa4
Tidying up InputTextApplyArithmeticOp()
2015-07-30 23:59:51 -06:00
ocornut
f63beeae86
Internal version of LogText() -> LogRenderedText() + shallow tidying up
2015-07-30 23:48:59 -06:00
ocornut
faa609a43c
Internal cleanup ParseFormatPrecision() doesn't take a reference
2015-07-30 23:14:29 -06:00
ocornut
f8646338c3
Merge remote-tracking branch 'origin' into 2015-07-cleanup
2015-07-30 23:00:11 -06:00
ocornut
7650d4cc67
Internal SliderFloatAsInputText() -> InputFloatReplaceWidget()
2015-07-30 22:59:30 -06:00
ocornut
abf823c6f6
Tidying up
2015-07-30 22:49:10 -06:00
ocornut
58ee08f214
Todo list notes
2015-07-30 22:18:07 -06:00
ocornut
040f3950a3
Merge remote-tracking branch 'origin' into 2015-07-cleanup
...
Conflicts:
imgui.cpp
2015-07-30 21:54:07 -06:00
ocornut
e6b29b70b4
Make internal SliderFloatAsInputText() take a size to match the calling widget
2015-07-30 21:51:55 -06:00
ocornut
c639f65eb7
Merge remote-tracking branch 'origin' into 2015-07-cleanup
...
Conflicts:
imgui.cpp
2015-07-30 21:37:47 -06:00
ocornut
02fbb36918
ImDrawList: Add missing support for anti-aliased thick-lines ( #133 , also ref #288 )
2015-07-30 21:11:07 -06:00
ocornut
a79ee94fc4
Removed unnecessary assignment + added comment
2015-07-30 20:59:41 -06:00
ocornut
709c4c3168
Merge remote-tracking branch 'origin' into 2015-07-cleanup
...
Conflicts:
imgui.cpp
2015-07-30 20:42:12 -06:00
ocornut
527208ad7c
Default font encoded as base85 saves ~100 lines / 26 KB of source code (from @mmalex)
2015-07-30 19:36:55 -06:00
ocornut
fddc871870
Columns: never assume horizontal space for scrollbar if NoScrollbar flag is set.
2015-07-30 12:32:20 -06:00
Xo Wang
8d45c89352
Remove non-text character at start of imgui.cpp
2015-07-26 19:18:04 -07:00
ocornut
4468ec001e
Fixed warning in console example (we're iterating chars)
2015-07-22 06:38:19 -06:00
ocornut
fb83323b1d
Tidying up
2015-07-21 20:13:12 -06:00
ocornut
62c888177a
Tweaks
2015-07-21 20:06:34 -06:00
ocornut
7552f48d7b
ImLoadFileToMemory() default parameters
2015-07-21 17:46:49 -06:00
ocornut
94f085aa3e
Update comments ( #219 )
2015-07-21 17:19:11 -06:00
ocornut
e32f0931e8
Missing includes for imgui_draw.cpp ( #219 )
2015-07-21 17:08:20 -06:00
ocornut
dace68b6fd
Big cleanup, split imgui.cpp into imgui_demo.cpp,imgui_draw.cpp imgui_internal.h ( #219 )
2015-07-21 17:00:28 -06:00
ocornut
60dce8bc22
Fix to get all code ShowTestWindow() copiable outside. Moved ShowMetricsWindows() above. ( #219 )
2015-07-19 11:45:03 -06:00
ocornut
83ebbebadd
Fixed inconsistent declaration of ImVec2 privates operators
2015-07-18 22:37:08 -06:00
ocornut
5a4b521855
Added ImDrawList::AddText() shorthand helper
2015-07-18 21:50:23 -06:00
ocornut
74908a9513
Fixed angles in ImDrawList::PathArcTo(), PathArcToFast() being off by an extra PI for no reason
2015-07-18 18:45:37 -06:00
ocornut
479211808f
ImDrawList::AddPolyLine() tidying up in AA path
2015-07-18 17:31:40 -06:00
ocornut
cdbf71ac12
Added ImGuiWindowFlags_NoInputs for input-passthru window
...
Would be more useful with finer control over display layer
2015-07-17 16:36:04 -06:00
ocornut
0ab620c2b9
Combo() clamp popup to lower edge of visible area
2015-07-17 16:14:04 -06:00
ocornut
20db726a9a
Version number 1.44 WIP
2015-07-17 16:03:13 -06:00
ocornut
4015414978
InputtextMultiline(): honor negative size consistently with other widgets
2015-07-17 16:01:21 -06:00
ocornut
3b53a6513a
Button() honor negative size consistently with other widgets that do so
2015-07-17 15:58:23 -06:00
ocornut
eca26ae91d
Build fix for MinGW ( #276 )
2015-07-17 13:38:55 -06:00
ocornut
99c5f5735c
Tweak button sizes
2015-07-17 07:08:51 -06:00
ocornut
e8cb874afe
Version number 1.43
2015-07-17 06:51:25 -06:00
ocornut
1266e4a181
Added a gratuitous About window
2015-07-16 20:58:26 -06:00
ocornut
d6117e33d0
AddInputCharactersUTF8: shallow tweaks ( #274 )
2015-07-15 22:14:04 -06:00
Daniel Gibson
be8fb858cc
Add ImGuiIO::AddInputCharactersUTF8(char* utf8str)
...
It'll convert the utf8 string to ImWchar's and passes each of them
to AddInputCharacter().
Very handy for SDL2 SDL_TEXTINPUT events, which provide a buffer with an
UTF-8 string.
2015-07-16 05:15:03 +02:00
ocornut
3ff04c95d5
Minor tweaks
2015-07-15 17:18:46 -06:00
ocornut
d170620816
Comments
2015-07-15 14:59:42 -06:00
ocornut
80276ef07b
Fixed ClearInputData()
2015-07-15 14:48:46 -06:00
ocornut
6c3ab6fc9b
ImFont: fixed minor bug with CPU-side vertical clipping of text.
2015-07-15 13:34:59 -06:00
ocornut
a56768463a
Examples: moved demo bits around.
2015-07-15 13:16:35 -06:00
ocornut
d750df9189
Fix for Shutdown()
2015-07-15 12:37:42 -06:00
ocornut
baa2328b99
Tweak to RenderCheckMark()
2015-07-15 12:31:37 -06:00
ocornut
8081e81e55
Fixed warnings + label
2015-07-15 11:56:07 -06:00
ocornut
1a3ef63132
Fixed parameters array size declaration (wouldn't have a side-effect but weird and misleading)
...
Thanks Coverity
2015-07-15 09:36:39 -06:00
ocornut
368d2c3568
OverlayDrawList readier for pushing elements (not exposed yet)
2015-07-15 09:26:03 -06:00
ocornut
035ff302d2
ImFontAtlas: moved application of FontDataOwnedByAtlas to AddFont()
2015-07-15 08:45:10 -06:00
ocornut
95f489ac1f
Merged AA branch in master! ( #133 )
2015-07-15 08:00:12 -06:00
ocornut
3e3d9f9a69
ImFontAtlas: allow AddFontDefault to take a config
2015-07-15 07:58:33 -06:00
ocornut
99a92ee7c5
Comments (fixed old comments)
2015-07-15 07:46:31 -06:00
ocornut
8952b93b2f
Include for alloca()
2015-07-15 07:31:32 -06:00
ocornut
fcec337061
Examples: Simplified font examples comments.
2015-07-15 07:05:34 -06:00
ocornut
815168c7ef
ImFontAtlas: new AddFont() API, oversampling, subpositiong, merging fonts, etc. ( #182 , #220 , #232 , #242 )
2015-07-15 07:01:21 -06:00
ocornut
6ae8062ca0
ImFont: comments, minor bits
2015-07-14 15:51:19 -06:00
ocornut
c02f9b58ef
ImFont: Cleanup to be compatible with over-sampling (not enabled)
2015-07-14 12:41:02 -06:00
ocornut
fc6545830b
Examples: displaying more font information.
2015-07-14 10:28:55 -06:00
ocornut
faec745438
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
2015-07-14 09:23:50 -06:00
ocornut
8cfd963fda
Popups: removed an apparently unnecessary test in CloseInactivePopups() that broke Combo boxes inside menus ( #272 )
2015-07-14 09:21:41 -06:00
ocornut
355cbf6326
Examples: added tests for Combo box in sub-menu test and MenuItem in a normal window ( #272 )
2015-07-14 09:10:31 -06:00
ocornut
52c820e7b0
Metrics: more details in popup stack ( #272 )
2015-07-14 09:09:52 -06:00
ocornut
ba9317b924
ImFont: storing offsets as X0/Y0/X1/Y1 analoguous to examples for stb_truetype
2015-07-13 16:08:49 -06:00
ocornut
5b053dd350
Fix for OverlayDrawList being ready to append commands (not exposed publicly yet anyway)
2015-07-13 15:52:57 -06:00
ocornut
7eca4e2a7f
Merge bits
2015-07-12 11:05:30 -06:00
ocornut
fbb9113118
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
...
Conflicts:
imgui.cpp
2015-07-12 11:02:46 -06:00
ocornut
4565bf9813
Demo: custom rendering example uses AddRectFilledMultiColor()
2015-07-12 10:52:20 -06:00
ocornut
6520b6c458
ImDrawList: added AddRectFilledMultiColor() helper + minor optimisation.
2015-07-12 10:48:06 -06:00
ocornut
7a0004eb86
Revert
2015-07-11 18:15:34 -06:00
ocornut
d10d0343b2
Plot() function can take 0.0f for both scale_min/scale_max to calculate scale
2015-07-11 18:10:43 -06:00
ocornut
e681937f66
Delete merging artefact that survived for a day
2015-07-11 08:41:11 -06:00
ocornut
fd44b9440b
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
...
Conflicts:
imgui.cpp
2015-07-10 21:45:25 -06:00
ocornut
b67593a4b1
Changed SameLine() parameters from int to float.
2015-07-10 19:36:34 -06:00
ocornut
8094aa78d2
Fixed incorrect assert triggering when code steal ActiveID move user moving window by calling e.g. SetKeyboardFocusHere()
2015-07-10 18:54:26 -06:00
ocornut
827ff970cd
InputText: Added ImGuiInputTextFlags_AlwaysInsertMode flag
2015-07-10 18:47:55 -06:00
ocornut
d2701727b9
InputText: added ImGuiInputTextFlags_NoHorizontalScroll flag. Added HasSelection() helper in ImGuiTextEditCallbackData as a clarification.
2015-07-10 18:17:46 -06:00
ocornut
398ef1a212
Comments
2015-07-08 17:10:14 -06:00
ocornut
245cf36522
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
2015-07-08 17:09:47 -06:00
ocornut
890585cde8
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
2015-07-08 17:08:51 -06:00
ocornut
08b1dd1035
Version number 1.43 WIP
...
Bits
2015-07-08 17:08:37 -06:00
ocornut
fec09e37ab
Disable warnings, undo f4aae6b9ec ( #265 #266 )
2015-07-08 17:05:24 -06:00
Stephan Dilly
f4aae6b9ec
fix minor clang-x64 warnings
...
fixes #265
2015-07-09 00:00:28 +02:00
ocornut
e5bea65582
Version number 1.42
2015-07-08 12:59:26 -06:00
ocornut
b36ff2fec3
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
2015-07-08 10:30:30 -06:00
ocornut
44c23e0eed
Allowing DeltaTime==0.0f to not assert
2015-07-08 09:48:10 -06:00
ocornut
67d93156df
Fixed clang/gcc warnings ( #133 )
2015-07-07 21:47:33 -06:00
ocornut
54c2665032
AA branch: undo d35c1a9e66, thickness is back but goes through non-AA path ( #133 )
2015-07-07 20:56:58 -06:00
ocornut
439040bb25
AA branch: more comments on breaking changes ( #133 )
2015-07-07 20:30:46 -06:00
ocornut
d03b046ef4
AA branch: Agressively renamed all fields of ImDrawList, ImDrawCmd, ImDrawData to match the rest of our coding convention ( #133 )
2015-07-07 20:17:07 -06:00
ocornut
d35c1a9e66
AA branch: removed the 'thickness' parameter from ImDrawList::AddLine()
2015-07-07 18:34:29 -06:00
ocornut
ac56e4e209
AA branch: API breaking change documentation
2015-07-07 18:31:41 -06:00
ocornut
af7f35d7c2
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
2015-07-07 18:22:18 -06:00
ocornut
87ebe95fd6
Columns/ImDrawList: dispatch render of each column in a sub-draw list and merge on closure, saving draw calls ( #125 )
2015-07-07 18:19:01 -06:00
ocornut
f4fc008a2a
Fixed ListBoxHeader() not honoring negative sizes the same way as BeginChild() or BeginChildFrame() ( #263 )
2015-07-07 16:53:09 -06:00
ocornut
acf58c6223
More debug-build friendly ImVector<> use micro optimisations for the most bottle-neck bunchs
2015-07-07 13:54:06 -06:00
ocornut
bfa7d86070
AA branch: further use of ImVector<> Data/Size
2015-07-07 12:58:36 -06:00
ocornut
c3ced1bd71
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
...
Conflicts:
imgui.cpp
2015-07-07 12:42:29 -06:00
ocornut
3869e10574
ImVector<> access to Size/Capacity/Data ( #262 )
2015-07-07 12:39:08 -06:00
ocornut
25882c47a3
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
...
Conflicts:
examples/directx11_example/imgui_impl_dx11.cpp
examples/directx9_example/imgui_impl_dx9.cpp
examples/opengl3_example/imgui_impl_glfw_gl3.cpp
examples/opengl_example/imgui_impl_glfw.cpp
imgui.cpp
2015-07-07 12:15:35 -06:00
ocornut
502e360ee5
Removed the majority of size_t from the code. ImVector<> now uses int. ( #262 )
...
May trigger new compilation warnings?
2015-07-07 12:09:25 -06:00
ocornut
aeae03f4ac
Fixed minor zealous Clang warning (demo code intentionally uses strdup() to be copiable)
2015-07-07 12:05:15 -06:00
ocornut
4d42760c0b
Metrics window: "Show clipping rectangles when hovering ImDrawList" enabled by default
2015-07-06 22:10:44 -06:00
ocornut
de6dfe8c5d
ImRect (internal) fixed ImVec4 constructor, argh (broken e7e2fcdd19)
2015-07-06 22:05:27 -06:00
ocornut
92b61d2ee4
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
2015-07-06 21:47:09 -06:00
ocornut
b92396b46a
Optimisation, removed the duplicate ClipRectStack in ImGuiWindow, storing single value
2015-07-06 21:46:12 -06:00
ocornut
6a22835f63
AA branch: ImDrawList: rename commands to cmd_buffer
...
Not strictly necessary but while we're doing minor breakage let's do
them at all once.
2015-07-06 21:09:05 -06:00
ocornut
e7e2fcdd19
ImRect (internal) made constructors more non-optimised compilation friendly
2015-07-06 20:59:01 -06:00
ocornut
a17e47fe14
ImDrawList: fixed non-merged commands when equal clip rectangles are in the two first commands
2015-07-06 20:38:06 -06:00
ocornut
5782c69c2a
Metrics window: calculate bounding box of actual vertices when hovering a draw list.
2015-07-06 16:34:41 -06:00
ocornut
9db4b35168
Fixed ImRect.Add(ImVec2&) which was broken and somehow unused
2015-07-06 11:13:05 -06:00
ocornut
0ff2a6ff64
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
...
Conflicts:
imgui.cpp
2015-07-06 10:56:50 -06:00
ocornut
d6987d1586
ImDrawList store pointer to their owner name for easier auditing/debugging. Metrics windows render clip rectangle when hovering.
2015-07-06 10:52:49 -06:00
ocornut
c52cefa2c2
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
2015-07-05 22:27:50 -06:00
ocornut
0d5e6e125c
Documentation ( #133 #254 )
2015-07-05 22:26:01 -06:00
ocornut
0676efd37f
AA branch: added ImDrawData::DeIndexAllBuffers() helper ( #254 )
2015-07-05 22:09:55 -06:00
ocornut
b2b616be00
AA branch: ImDrawCmd idx_count -> elem_count
2015-07-05 22:09:15 -06:00
ocornut
f3303fa84f
AA branch: io.RenderDrawListsFn signature changed to take ImDrawData, neater and future proof breaking of the render API ( #133 #254 )
2015-07-05 22:03:46 -06:00
ocornut
2633325b9f
Comments
2015-07-05 21:55:24 -06:00
ocornut
562aecdaa5
Removed obsolete GetDefaultFontData() function that would assert anyway (obsoleted 2015/01/11)
2015-07-05 20:56:01 -06:00
ocornut
3fa4451936
PlotLines(), PlotHistogram(): fixed incorrect hovering test (would trigger tooltip when menu is open)
2015-07-05 20:47:25 -06:00
ocornut
1c160adbba
Comments
2015-07-05 20:38:18 -06:00
ocornut
c9676554b9
MenuItem() can be activated on release ( #245 )
2015-07-05 20:27:06 -06:00
ocornut
56553f33b8
AA branch: added style.AntiAliasedLines, style.AntiAliasedShapes ( #133 )
2015-07-05 19:09:53 -06:00
ocornut
19e59421e5
AA branch: comments, inlining minor ops
2015-07-05 18:42:41 -06:00
ocornut
46c440d186
AA branch: AddPolyline() stores normals on stack
2015-07-05 18:19:22 -06:00
ocornut
c09af38804
AA branch: AddConvexPolyFilled() store normals on stack
2015-07-05 18:05:55 -06:00
ocornut
a74ca9025f
AA branch: oops, ImInvLengthSqr() is ImInvLength()
2015-07-05 17:37:55 -06:00
ocornut
a8b5f77591
AA branch: AddPolyline(), AddConvexPolyFilled() a little more readable with more consistent naming
2015-07-05 17:36:07 -06:00
ocornut
0292c82b9c
AA branch: fix lower-right bound of frame outlines
2015-07-05 16:52:06 -06:00
ocornut
2f21347803
CollapsingHeader() fixed label rendering outside in columns context where cliprect max isn't aligned with header
2015-07-05 16:37:49 -06:00
ocornut
7959fbe992
AA branch: CollapsingHeader() rounding down half window padding
2015-07-05 16:35:41 -06:00
ocornut
f04c2002d6
AA branch: fixed column offsets not always aligned to the pixel causing CollapsingHeader() border to incorrectly anti-alias
...
Fixing framed CollapsingHeader() inside columns, where
GetContentRegionMax() doesn't return pixel aligned rounded position.
2015-07-05 16:32:26 -06:00
ocornut
0d7ca3da24
AA branch: AddLine() api adds the 0.5f offset (unsure about that yet)
2015-07-05 16:24:55 -06:00
ocornut
18fa8e1c7e
Fixed IsMouseDragging() ( fix #260 )
2015-07-04 16:46:30 -06:00
ocornut
3b94c37efc
AA branch: minor tweaks + disabled debug code that disable AA when holding Ctrl
2015-07-04 12:59:55 -06:00
ocornut
f435e42561
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
...
Conflicts:
examples/opengl_example/imgui_impl_glfw.cpp
2015-07-04 12:44:25 -06:00
ocornut
d76bc3434e
Added DragFloatRange2() DragIntRange2() helpers ( #76 )
2015-07-04 12:17:11 -06:00
ocornut
7437b43b2d
Fixed warnings for more pedantic settings ( #258 )
2015-07-03 08:15:56 -06:00
ocornut
b69d7d9df3
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
2015-07-02 21:47:48 -06:00
ocornut
6826ab3ffd
Added GetKeyIndex() helper.
2015-07-02 21:32:29 -06:00
ocornut
0f9e2f8173
Tweaked scrolling example code ( #150 )
2015-07-02 21:22:16 -06:00
ocornut
42efc29def
SetScrollFromCursorPos() -> SetScrollHere() ( #150 ) final call !
2015-07-02 21:03:15 -06:00
ocornut
4eba6cd470
Added SetScrollY(), SetScrollFromPosY(). Renamed SetScrollPosHere() to SetScrollFromCursorPos(). ( #150 )
2015-07-02 20:53:45 -06:00
ocornut
b37a326163
Renamed GetScrollPosY() to GetScrollY(). ( #150 )
...
Necessary to reduce confusion along with other scrolling functions,
because positions (e.g. cursor position) are not equivalent to scrolling
amount.
2015-07-02 20:47:04 -06:00
ocornut
9bedcb5304
Added GetCursorStartPos() necessary for using scroll target relative to beginning of window content ( #150 )
2015-07-02 14:46:49 -06:00
ocornut
1b01137c90
Fixed text baseline alignment of small button (no padding) after regular buttons
...
Currently being a coward and only doing it via the SmallButton() entry
point.
2015-07-02 12:44:48 -06:00
ocornut
bbc22ac8ca
Comments + remove trailing comma
2015-07-02 11:26:35 -06:00
ocornut
90ec28f6de
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
2015-07-02 10:23:21 -06:00
ocornut
e0da1e0658
Split into CaptureKeyboardFromApp() / CaptureMouseFromApp()
2015-07-02 09:20:15 -06:00
ocornut
77fad80e9f
Added CaptureInputsFromApp() to manually enforce e.g. keyboard capturing
2015-07-02 09:10:31 -06:00
ocornut
57f70a29b2
Fixed a bug with TextUnformatted() clipping of long text ( #257 )
2015-07-02 07:42:29 -06:00
ocornut
0e5b64ecd2
SetScrollPosHere() Minor hack for effective "scroll to top" to appear like user expect it ( #150 )
...
Compensate the difference between WindowPadding and ItemSpacing
2015-07-01 19:01:27 -06:00
ocornut
824cf5ae85
Fixed window padding being reported incorrectly for child windows with borders when parent have no borders
2015-07-01 18:55:42 -06:00
ocornut
3d7b596a40
SetScrollToPosHere() fixed imprecision + handling lower gap better for bottom alignment ( #150 )
2015-07-01 18:23:11 -06:00
ocornut
49b7a8e61f
Added scroll tracking example with SetScrollPosHere() (relate #150 )
2015-07-01 18:01:43 -06:00
ocornut
b74d8e4c87
SetScrollPosHere() takes a y centering ratio and can be used to aim the top or bottom of the window (relate #150 )
2015-07-01 17:51:44 -06:00
ocornut
067b7d909a
Style: Added GrabRounding (works well with AA branch). Followup to #212
2015-06-30 15:02:59 -06:00
ocornut
d3c0bfefb3
AA branch: render axis aligned rect bypassing the AA path
2015-06-30 14:51:25 -06:00
ocornut
b30d08d63a
AA branch: bits
2015-06-30 14:24:50 -06:00
ocornut
c39372e7d5
Title bar uses TitleBgActive color even when window has popups/menus over ( #253 )
2015-06-30 13:52:00 -06:00
ocornut
47826830af
Adding TitleBgActive color - still issues with popups/menus ( #253 )
2015-06-30 13:40:13 -06:00
ocornut
c71b183965
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
2015-06-30 13:31:56 -06:00
ocornut
4bb94a9e4d
AA branch: more optimisations.
2015-06-30 13:27:35 -06:00
ocornut
a8f0eb5ec6
AA branch: more optimisations.
2015-06-30 13:12:45 -06:00
ocornut
bbdf36cd3a
AA branch: minor optimisations, merging loops
2015-06-30 13:09:07 -06:00
ocornut
c3040dee35
AA branch: more inline.
2015-06-30 12:55:14 -06:00
ocornut
077285ae57
AA branch: tidying up, inline PathStroke PathFill
2015-06-30 12:51:52 -06:00
ocornut
aaefe458df
AA branch: cleanup
2015-06-30 12:44:03 -06:00
ocornut
ebfe4637d4
Merge branch '2015-04-indexed-rendering' into 2015-03-antialiased-primitives
...
Conflicts:
imgui.cpp
imgui.h
2015-06-30 12:43:26 -06:00
ocornut
d57ee2458c
AA branch: ImDrawList: renaming of Path based functions so both code paths can cohabit with no confusion
2015-06-29 19:25:41 -06:00
ocornut
5bf30bd6c4
AA branch: Minor optimisations for Debug builds
2015-06-29 19:23:57 -06:00
ocornut
43dcd6ef47
Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering
...
Conflicts:
imgui.cpp
2015-06-29 15:43:58 -06:00
ocornut
0bf90770b0
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
...
Conflicts:
imgui.cpp
2015-06-29 15:40:38 -06:00
ocornut
0e3198edc2
Tidying up - renamed FindBestWindowPos() to FindBesttPopupWindowPos()
2015-06-29 15:18:26 -06:00
ocornut
af0de5f357
Tidying up - ImRect doesn't use ImVec2 operators (so we can expose it later)
2015-06-29 13:30:37 -06:00
ocornut
882c7a8cef
Tidying up - ShowUserGuide, ShowStyleEditor only uses public calls
2015-06-29 13:20:28 -06:00
ocornut
039ebb79f4
Tidying up - renamed a few internal functions
2015-06-29 13:18:44 -06:00
ocornut
8b392feba1
Tidying up - moved ImFontAtlas glyph ranges helpers outside of ImFont block
2015-06-29 12:36:24 -06:00
ocornut
0783697f87
Minor tidying up
2015-06-29 10:39:17 -06:00
ocornut
4ac21aaa12
Version number 1.42 wip + todo list entries
2015-06-26 20:48:53 -06:00
Ben Vanik
5cd1a01514
Fixing 64-bit compilation warning caused by implicit size_t->int cast
2015-06-26 18:49:45 -07:00
ocornut
f66be0e7b2
Demo: satisfying buffer size
2015-06-25 21:52:16 -06:00
ocornut
ea2c824192
Version 1.41
2015-06-25 21:38:24 -06:00
ocornut
8224ca16b6
Carriage return in demo tooltip
2015-06-24 20:45:06 -06:00
ocornut
4976bf97a6
Fix for correctness and allow non-auto resized modals to have window minimum size applied - hopefully no-side effects ( #249 )
2015-06-24 20:35:40 -06:00
ocornut
af5890b276
AutoFit can be triggered on each axis separately via SetNextWindowSize() (mentioned in #249 )
2015-06-24 20:08:08 -06:00
ocornut
975ef00682
Minor construction fix (-1.0 is correct "disabled" value for TextWrapPos, didn't have any incidence anyway)
2015-06-24 19:53:41 -06:00
ocornut
d171e48b20
Fixed SetNextWindowPosCenter() being processed too early for windows that are still measuring their size (for #249 )
2015-06-23 15:45:34 -06:00
ocornut
5436266963
Added SetNextWindowPosCenter() ( #249 )
2015-06-23 15:34:44 -06:00
ocornut
bcbf53857c
BeginPopupModal() default to NoCollapse for modal windows ( #249 )
2015-06-23 15:17:27 -06:00
ocornut
06ed9257ef
Modal windows centered when appearing ( #249 )
2015-06-23 14:28:11 -06:00
ocornut
2a041cfbe1
Added GetGlyphRangesCyrillic() helper ( #237 )
2015-06-23 14:13:22 -06:00
ocornut
0f38a53d28
Added stacked modal windows example ( #249 )
2015-06-23 13:58:47 -06:00
ocornut
f0311b643a
Added modal dialog example ( #249 )
2015-06-23 13:22:37 -06:00
ocornut
a4cd585f54
Reorganized demo window
2015-06-23 12:47:38 -06:00
ocornut
fe17f6e735
Added modal window darkening of previous windows ( #249 )
2015-06-23 12:34:15 -06:00
ocornut
8c790a3234
BeginPopupModal() can have an optional close-window button ( #249 )
2015-06-23 11:08:19 -06:00
ocornut
bce495c581
Added BeginPopupModal() with actual modal behaviour (WIP api) ( #249 )
2015-06-23 10:02:56 -06:00
ocornut
0b98d3eb26
Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering
...
Conflicts:
imgui.cpp
2015-06-21 20:01:25 -06:00
ocornut
01cb0dc7f7
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
...
Conflicts:
imgui.cpp
imgui.h
2015-06-21 19:58:30 -06:00
ocornut
0884cb51cd
Added IsKeyReleased() ( #248 ), added keyboard & mouse state panel in the demo window
2015-06-21 19:04:43 -06:00
ocornut
68534c2319
Added IsMouseReleased() helper ( #248 )
2015-06-21 18:15:31 -06:00
ocornut
eec047c9f7
Fixed leak on Shutdown ( #200 )
2015-06-19 18:14:50 -06:00
ocornut
9e8da4dba0
Comments
2015-06-19 18:09:58 -06:00
ocornut
747999bbaf
Fixed mouse wheel scroll issues, introduced a few weeks ago ( #200 )
2015-06-19 18:01:13 -06:00
ocornut
e7b43b014b
Can't scroll with mouse wheel when window is collapsed.
2015-06-19 17:43:51 -06:00
ocornut
1b28f11acb
InputTextMultiline() filtering out \r for now ( #200 )
2015-06-19 17:34:19 -06:00
ocornut
73db855c77
InputTextMultiline() painfully merged most computation passes into one, better clipping, much faster for large text ( #200 )
2015-06-18 23:23:20 -06:00
ocornut
84987ac3e0
ImFont::RenderText() better vertical clipping for large amount of text (for #200 )
2015-06-18 23:08:42 -06:00
ocornut
324b1c2a28
InputTextMultiline(): made ctrl+up/down closer to windows behavior ( #200 )
2015-06-18 22:35:08 -06:00
ocornut
c4720ec90f
InputTextMultiline() fixed a frame of lag in handling vertical scrolling ( #200 )
2015-06-18 21:20:15 -06:00
ocornut
cd27f8a8e6
InputText(): adjusting selection block height differently for single and multi-line ( #200 )
2015-06-18 21:01:56 -06:00
ocornut
b524c59c70
InputText(): removed a call to strlen() in the active edit path ( #200 )
2015-06-18 20:49:20 -06:00
ocornut
2b68a5c0cf
InputTextMultine() optimised height calculation for inactive multi-line edit box ( #200 )
2015-06-18 19:09:04 -06:00
ocornut
86666489df
ImFont: CalcTextSizeA() fixed font scaling with fallback character.
2015-06-18 18:31:49 -06:00
ocornut
c6d77f3bf5
InputText: fixed handling of scaled font. re-organized bits of code toward merging all sizes calculations ( #200 )
2015-06-18 18:31:13 -06:00
ocornut
10b4fa44c1
Fixed framerate counter averaging buffer size (shouldn't have been included in previous commit)
2015-06-18 17:45:11 -06:00
ocornut
26d2b361d1
InputText(): removed extraneous CalcTextSizeW call for tracking cursor/scrolling, remove spike ( #200 )
2015-06-18 17:40:51 -06:00
ocornut
5f362cabe9
InputText(): char width calculation calls font->GetCharAdvance() directly ( #200 )
2015-06-18 17:11:20 -06:00
ocornut
60079988bd
ImFont::RenderText() faster handling of rendering above clipping rect (useful for #200 )
2015-06-18 12:41:48 -06:00
ocornut
846cfc74a2
InputText() clear selection when using undo/redo ( #200 )
2015-06-18 12:32:55 -06:00
ocornut
d30e8f38b7
InputText() tidying up ( #200 )
2015-06-18 12:29:43 -06:00
ocornut
8fbb4a566a
InputTextMultiline() preserve activeid/cursor/selection when using scrollbar + tidying up ( #200 )
2015-06-18 11:57:43 -06:00
ocornut
9180126db6
Speeding up some wchar<>UTF8 functions and some specialization for Ascii. (testing 500 KB text for #200 )
2015-06-18 11:30:10 -06:00
ocornut
c06373de93
Cleanup
2015-06-18 10:40:11 -06:00
ocornut
d0ea5942a9
InputTextMultiline() can clip + BeginChildFrame() returns bool. ( #200 )
2015-06-18 08:49:57 -06:00
ocornut
9c399ee3be
Demo for InputTextMultiline() ( #200 )
2015-06-17 18:36:06 -06:00
ocornut
b0e8643523
Demo for InputTextMultiline() ( #200 )
2015-06-17 18:31:15 -06:00
ocornut
490e9e42ff
InputText(): shallow tweaks ( #200 )
2015-06-17 18:14:25 -06:00
ocornut
5e323561be
InputTextMultiline() fixes, vertical scrolling, optimizations ( #200 )
...
Using a child window for multi-line text.
2015-06-17 17:07:49 -06:00
ocornut
3df91b52ea
Increased key repeat rate for non-character input key repeat.
...
Dodgy - we should have a match here for character input and
non-character input (e.g. holding 'a' vs holding 'backspace' should be
same rate), but for the earlier we don't have the info?
2015-06-17 16:02:50 -06:00
ocornut
7dc5228235
InputText: doesn't reset scrolling when active text input becomes bigger than its content. ( #200 )
...
Mostly because it's expensive.
2015-06-17 15:49:18 -06:00
ocornut
f75b8c72cf
InputTextMultiline(): vertical scrolling wip, selection rendering fix ( #200 )
2015-06-16 21:53:04 -06:00
ocornut
417a7bc29b
InputTextMultiline(): multi-line selection draw fix ( #200 )
2015-06-16 21:19:47 -06:00
ocornut
f1dfc4d7c4
InputTextMultiline(): multi-line selection draw fix ( #200 )
2015-06-16 21:17:02 -06:00
ocornut
917a1fdbf7
InputText() fixing cancel ( #200 )
2015-06-16 21:08:54 -06:00
ocornut
73491e5adc
InputText() lifted 1024 characters limit ( #200 )
...
Bit messy & not happy with using ImVector<char>
2015-06-16 21:04:27 -06:00
ocornut
0795a60c6b
InputText() fixed multi-line selection clipping. ( #200 )
2015-06-16 20:35:46 -06:00
ocornut
ec7c1834b3
InputTextMultiline() tabbing to a multi-line edit doesn't select all (unless ImGuiInputTextFlags_AutoSelectAll is set), somehow arbitrary (#
...
Seems reasonable
2015-06-16 20:25:08 -06:00
ocornut
6d31c498c0
InputText: multi-line selection, better scrolling, cleaning up ( #200 )
...
Not horizontally scrolling on char boundaries anymore
2015-06-16 20:14:54 -06:00
ocornut
d06ad43dca
ImFont::RenderText() additional early out (typically performed at TextUnformatted() level for large chunks but this is also useful) ( #200 )
2015-06-16 17:50:55 -06:00
ocornut
748837acfd
Merge remote-tracking branch 'origin' into 2015-06-multiline_textedit
...
Conflicts:
imgui.h
2015-06-16 17:23:28 -06:00
ocornut
a248575dea
Text rendering can be finely clipped cpu-side on top and left axises (for #200 )
2015-06-16 17:21:07 -06:00
ocornut
9765559a28
Merge remote-tracking branch 'origin' into 2015-06-multiline_textedit
...
Conflicts:
imgui.cpp
2015-06-16 15:59:28 -06:00
ocornut
34986771b4
Moved InputFloat() InputInt() below InputText() and not in the middle of internal bits
2015-06-16 15:57:04 -06:00
ocornut
0df7b472c2
InputTextMultiline() WIP - still gazillion problems with selection visualisation & scrolling
2015-06-16 15:46:45 -06:00
ocornut
b360c83e92
Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering
2015-06-14 20:29:10 -06:00
ocornut
7d860a0181
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
...
Conflicts:
imgui.cpp
2015-06-14 20:28:19 -06:00
ocornut
6eb1fec7a9
ImFont: added GetCharAdvance() helper. Exposed font Ascent and font Descent.
2015-06-14 17:30:06 -06:00
ocornut
b503e5ee5b
ImageButton() changed default bg_col parameter from (0,0,0,1) black to (0,0,0,0) tranparent + drawing frame even when no padding ( #243 )
2015-06-14 16:18:22 -06:00
ocornut
4f0fa58ff2
Selectable() changed prototype moved flags before size. size override should rarely have been used! sorry. #125
2015-06-14 15:19:47 -06:00
ocornut
cf481e1a7b
Selectable() added flags ImGuiSelectableFlags_DontClosePopups , ImGuiSelectableFlags_SpanAllColumns ( #125 )
2015-06-14 12:41:40 -06:00
ocornut
2bcafc861e
SelectableEx - replaced unnecessary extra size_draw parameter by a flag.
2015-06-13 14:20:02 -06:00
ocornut
96496ced5f
Metrics windows display storage size
2015-06-11 16:04:06 -06:00
ocornut
039418f393
ColorButton(), ColorEdit4(): colored square stays square, used vertical padding on both axis.
2015-06-09 14:39:27 -06:00
ocornut
6bb06fdb81
Selectable, MenuItem: don't use frame rounding for hovering/selection.
2015-06-09 14:32:37 -06:00
ocornut
3fd4441f70
SetScrollPosHere() fixed imprecisions
2015-06-09 13:14:22 -06:00
ocornut
3ca54ad369
SetScrollPosHere() takes account of item height + more accurate centering
2015-06-09 12:57:27 -06:00
ocornut
e8422f7aa0
SetScrollPosHere() rewrote to that window size is not required at the time of calling, can be used on frame 0 of an auto-resizing window
2015-06-09 12:49:13 -06:00
ocornut
8c86322068
Combo() now using the popup facility. More consistent + when combo open hovering other widgets is disabled. ( #241 )
2015-06-09 12:35:55 -06:00
ocornut
6f1dd7a688
Allow Set*WindowSize() calls to be used with popups (fix for using e.g. scroll function on the first frame)
2015-06-09 12:32:19 -06:00
ocornut
6807546caf
Allow Set*WindowSize() calls to be used with popups.
2015-06-09 11:35:29 -06:00
ocornut
4536668482
Fixed issue with activating a Combo() not taking active id ( #241 )
2015-06-09 10:09:12 -06:00
ocornut
20088303e9
ImFont: ignoring \r
2015-06-04 12:26:23 +01:00
ocornut
eb75ffdc5d
DragFloat(), SliderFloat() Fixed rounding of negative which sometimes made the negative lower range unreachable.
2015-06-03 15:31:08 +01:00
ocornut
0e04dfbad7
Added IsWindowHovered() helper.
2015-06-02 20:57:29 +01:00
ocornut
9928d19af1
Version 1.41 WIP
2015-06-02 14:41:14 +01:00
ocornut
82d4180f39
Bits of TODO list
2015-05-31 21:15:35 +01:00
ocornut
931b8dcdaf
Version 1.40
2015-05-31 19:31:02 +01:00
ocornut
a76eea85c8
Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering
...
Conflicts:
imgui.cpp
2015-05-31 16:59:01 +01:00
ocornut
ade7661b3f
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
2015-05-31 16:57:43 +01:00
ocornut
8738147aee
Windows: pragma link with user32.lib if we are using native clipboard function (unless IMGUI_DISABLE_WIN32_DEFAULT_CLIPBOARD_FUNCS) #238
2015-05-31 15:55:32 +01:00
ocornut
1c2dac2a90
Version increased to 1.40 WIP makes more sense than 1.39 (changelog is huge)
2015-05-31 14:46:28 +01:00
ocornut
04e91500c5
Comments
2015-05-31 14:03:07 +01:00
ocornut
374d160234
BeginPopupContextWindow() in_empty_space_only -> !also_over_items ( #126 )+ comments
...
Sorry if you used this parameter already.
2015-05-31 12:55:12 +01:00
ocornut
bda0269133
ListBox() uses ImGuiListClipper helper, faster for large lists, assume evenly sized items.
2015-05-31 12:35:21 +01:00
ocornut
eb4ffd5dbd
Added ImGuiListClipper helper to avoid using CalcListClipping() directly.
2015-05-31 12:33:24 +01:00
ocornut
446d8abfb0
ListBoxHeader() can return false. Also made ListBox() only use public API.
2015-05-31 11:54:00 +01:00
ocornut
df37df821e
RetWindowCollapsed() to IsWindowCollapsed() for consistency. Kept inline indirection.
2015-05-31 11:52:57 +01:00
ocornut
0539be7067
Added IMGUI_DISABLE_OBSOLETE_FUNCTIONS
2015-05-31 11:17:58 +01:00
ocornut
03ff2faacb
Comments
2015-05-31 11:01:22 +01:00
ocornut
9417df2a26
Renamed IsRectClipped to IsRectVisible for consistency. Note that return value is opposite! Kept inline redirection function (will obsolete)
2015-05-31 09:12:07 +01:00
ocornut
5ea23977f7
Fixed uninitialized fields in constructor - wouldn't have caused a problem (thanks Coverity!)
2015-05-29 14:54:33 +01:00
ocornut
f1f3424cdd
Popups WantCaptureMouse active when popups/menus are active + using tracked mouse button ownership when mouse down ( #126 )
2015-05-29 11:42:35 +01:00
ocornut
73d1126bf4
Examples: OCD tweaks, a sign that we are near the release!
2015-05-29 11:15:24 +01:00
ocornut
448b262b37
Examples: Comments.
2015-05-29 11:11:50 +01:00
ocornut
83770e5e40
Examples: Tweaks. Usnig sprintf() in user-copiable code.
2015-05-29 11:05:17 +01:00
ocornut
0db6bac590
Examples: Tweaks, demo code creating graph data actually creates data at the correct rate.
2015-05-29 11:01:53 +01:00
ocornut
9ace617e7e
Examples: Tiding up. Moved Dragging example higher up.
2015-05-29 10:52:45 +01:00
ocornut
616a7e6c61
Examples: Using a helper function for ? markers
2015-05-29 10:44:30 +01:00
ocornut
d86785ac98
Examples: Fixed Simple Layout example always showing. Using BeginPopupContextItem().
2015-05-29 10:36:33 +01:00
ocornut
4144c59ce4
Added Simple Layout example applet
2015-05-29 10:29:26 +01:00
ocornut
15a26a479b
Fixed auto-filling child window using WindowMinSize at their minimum size, irrelevant. Using an arbitrary small number instead.
2015-05-29 10:24:03 +01:00
ocornut
f0781d3a24
Added GetItemsLineHeightWithSpacing() helper.
2015-05-29 09:00:34 +01:00
ocornut
aaefe462bb
Popups: calling OpenPopup() on already open popup doesn't close it's child ( #126 )
...
Fixed previous commit.
2015-05-28 23:47:01 +01:00
ocornut
78dc54ab3d
Popups: calling OpenPopup() on already open popup doesn't close it's child ( #126 )
...
It think it makes more sense? Maybe?
Note that calling OpenPopup() every frame probably doesn't make sense.
2015-05-28 23:37:11 +01:00
ocornut
7847100ad8
Tweak BeginMenu() code
2015-05-28 23:14:25 +01:00
ocornut
733e079081
Moved CloseInactivePopups() and tweaked.
2015-05-28 23:04:29 +01:00
Branimir Karadžić
123fd73c8c
Merge remote-tracking branch 'upstream/master'
2015-05-27 22:01:37 -07:00
Branimir Karadžić
cd9244ab15
Define STBTT_DEF extern when STBTT not compiled with ImGui.
2015-05-27 16:12:52 -07:00
ocornut
dcc7df2b21
Added BeginPopupContextVoid() helper for completeness ( #126 )
2015-05-27 23:28:53 +01:00
ocornut
235cca4f97
Fix to allow opening popup from a left-click on void or another window (because left-click would normally override focus immediately) ( #126 )
...
Neither appears to be really useful frankly.
2015-05-27 23:24:39 +01:00
ocornut
1cb6a294b0
BeginPopupContextWindow() rearranged and clarified parameters ( #126 )
2015-05-27 23:07:24 +01:00
ocornut
b0a9bbf6f6
Popup taking focus deactivate focused widget of other window ( #126 )
...
e.g. focus InputText(), open contextual popup, input text used to stay
focused
2015-05-27 22:58:49 +01:00
ocornut
f8b7d5c76d
Tracking ActiveIdWindow along with ActiveId
2015-05-27 22:53:43 +01:00
ocornut
938528e5ee
Added BeginPopupContextItem() / BeginPopupContextWindow() ( #126 )
2015-05-27 22:36:23 +01:00
ocornut
5b0861768e
Fixed GetId()/BeginPopup() accessing current window in "append" mode
2015-05-27 22:26:03 +01:00
ocornut
8c4c421f74
Added IsAnyItemHovered() public helper.
2015-05-27 22:02:12 +01:00
ocornut
70f2ff0e5a
No minimum size for popups
2015-05-27 21:59:02 +01:00
ocornut
99ff45ad2e
Tweak context menu example
2015-05-27 21:42:16 +01:00
ocornut
90db64d4e3
Added context menu example on a DragFloat widget
2015-05-27 21:39:41 +01:00
ocornut
487500d291
Tweaks
2015-05-27 16:03:44 +01:00
ocornut
7d28fe5915
WIP Menus: Reverted f26de46350 for now ( #126 )
2015-05-27 15:51:50 +01:00
ocornut
d05c1d58c3
Oops
2015-05-27 15:44:07 +01:00
ocornut
405785ea62
ItemWidthStack can be empty, to remove one allocation per window
2015-05-27 15:42:29 +01:00
ocornut
0a7024c198
Store common stacked settings contiguously in memory to reduce cache misses & unnecessary heap allocations
2015-05-27 15:35:49 +01:00
ocornut
3d36c81241
Added PushButtonRepeat() / PopButtonRepeat(). REMOVED third 'repeat_if_held' parameter of Button() !
2015-05-27 15:22:09 +01:00
ocornut
d69f2f57ee
Added configurable io.KeyRepeatDelay, io.KeyRepeatRate
2015-05-27 15:17:44 +01:00
ocornut
904e187f70
Simplified some widget code, moving alignment to RenderTextClipped()
2015-05-27 14:39:41 +01:00
ocornut
3c264827fd
Reordering parameters of internal RenderTextClipped()
2015-05-27 14:24:52 +01:00
ocornut
f841097e99
Button centering left to RenderTextClipped function.
2015-05-27 14:20:50 +01:00
ocornut
f26de46350
Button() closes active popup ( #126 ) unsure about that
2015-05-27 09:28:44 +01:00
ocornut
e6ac9e88aa
Refactor Button() and SmallButton() into a shared function ButtonEx()
2015-05-27 09:22:30 +01:00
ocornut
843219daec
Spacing + untabify
2015-05-26 22:14:07 +01:00
ocornut
7b8b5754bc
EndGroup() carries on the text base offset from the last line of the group (sort of incorrect but better than nothing)
2015-05-26 22:13:07 +01:00
ocornut
6f32684f15
Examples: various usage comments.
2015-05-26 21:36:44 +01:00
ocornut
15113f682e
Added TextDisabled(), TextDisabledV() helpers.
2015-05-26 21:10:16 +01:00
ocornut
3a6e6645e6
WIP Menus: Fixed remaining inconsistency with stacks of popups. Activating/closing a menu close the parent popup. Added test case. ( #126 )
2015-05-26 20:33:48 +01:00
ocornut
90cf77b191
Merge remote-tracking branch 'origin' into 2015-05-menus
2015-05-26 18:03:46 +01:00
ocornut
6b3ccd3edf
WIP Menus: Added support for disabled sub-menu ( #126 )
2015-05-26 18:02:42 +01:00
ocornut
0db122bc3b
Comments. Examples: added empty if (MenuItem()) {} statements in more places to better document the typical use cases ( #126 )
2015-05-26 17:48:28 +01:00
ocornut
fdce095101
Comments
2015-05-26 17:27:35 +01:00
ocornut
d009a85de4
WIP Menus: Implement amazon's dropdown-like triangle test for navigating sub-menus ( #126 )
2015-05-26 17:09:21 +01:00
ocornut
63a39dd08e
WIP Menus: Recursive menu demo ( #126 ). Actually useful to test sub-menu positioning.
2015-05-26 16:14:51 +01:00
ocornut
cdb5e16f70
SelectableEx: use flags internally (similar to ButtonBehavior)
2015-05-26 16:12:40 +01:00
ocornut
4eeba016f6
WIP Menus: Closing sub-menu when hovering something else in the same parent window ( #126 )
...
Immediate open/close is error-prone
2015-05-26 15:01:04 +01:00
ocornut
83b10f77a9
Comments
2015-05-25 23:47:59 +01:00
ocornut
98540370a0
WIP Menus: Layout in menu-bar tweaks to lay better when mixed widgets ( #126 )
2015-05-25 23:15:00 +01:00
ocornut
bb8cdcb916
WIP Menus: Layout in menu-bar more standard, allows mixing different widgets in menubar. ( #126 )
...
Still some minor spacing bugs.
2015-05-25 23:08:22 +01:00
ocornut
83cb040d20
Selectable: text baseline alignment for line that aren't of text height.
2015-05-25 23:03:16 +01:00
ocornut
44ed5640d3
WIP Menus: Sub-menu overlapping amount not hardcoded ( #126 )
2015-05-24 23:58:40 +01:00
ocornut
0836f69d9b
WIP Menus: Fixed style.WindowPadding == 0 leading to zero-sized initial clipping rectangle leading to self-collapsing childs ( #126 )
2015-05-24 23:56:29 +01:00
ocornut
6c749934ec
Combo: empty label doesn't add ItemInnerSpacing alignment, matching other widgets
2015-05-24 23:45:44 +01:00
ocornut
9abcbf73cb
WIP Menus: Sub-menus appears over the parent-menu scrollbar if there is one (unsure about that) ( #126 )
2015-05-24 23:37:47 +01:00
ocornut
63aa035f59
WIP Menus: Fixed estimation of scrollbar width (broke in 292f08b11e) ( #126 )
2015-05-24 23:25:57 +01:00
ocornut
8c1d7daef8
WIP Menus: Fixed repositioning of menus when there's no room in the 4 quadrants., we still keep them within the visible display area ( #126 )
...
vs popup which prefer to stay away from the mouse cursor
2015-05-24 23:17:06 +01:00
ocornut
1ab1712849
WIP Menus: Clicking the label of an already open sub-menu doesn't close it unless from a menu-bar (match Windows behavior) ( #126 )
...
Argh,
2015-05-24 22:33:04 +01:00
ocornut
48ede93a58
WIP Menus: Fixed closing popup on menu item activation when a child menu is open from the popup ( #126 )
2015-05-24 22:30:48 +01:00
ocornut
53892ab893
WIP Menus: Fixed manually closing submenu affecting position of the following window ( #126 )
2015-05-24 21:20:10 +01:00
ocornut
292f08b11e
WIP Menus: Fixed some alignment issues with non standard styles. Tweaked menu-bar color ( #126 )
2015-05-24 21:11:11 +01:00
ocornut
14bcfef041
Merge remote-tracking branch 'origin' into 2015-05-menus
...
Conflicts:
imgui.cpp
2015-05-24 17:32:10 +01:00
ocornut
8cfae35042
Added Dummy() helper
2015-05-24 17:30:59 +01:00
ocornut
89d1340225
WIP Menus: Added Enabled/Disabled option for MenuItem() ( #126 )
2015-05-23 13:54:57 +01:00
ocornut
485832fe06
WIP Menus: Added BeginMainMenuBar()/EndMainMenuBar() helpers. Added to examples.
2015-05-23 13:43:45 +01:00
ocornut
e6b1e39847
WIP Menus: don't clamp windows within display when a position has been explicitly set by user. Menu item spacing uses ItemSpacing. ( #126 )
2015-05-23 13:43:13 +01:00
ocornut
e7097d6176
WIP Menus: menus now affected by WindowMinSize ( #126 )
2015-05-23 13:03:09 +01:00
ocornut
e3f2ad728a
Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering
...
Conflicts:
examples/directx11_example/imgui_impl_dx11.cpp
2015-05-21 22:57:29 +01:00
ocornut
cc3ed515ca
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
...
Conflicts:
imgui.cpp
2015-05-21 22:52:46 +01:00
ocornut
882b4a5eb4
Merge remote-tracking branch 'origin' into 2015-05-menus
...
Conflicts:
imgui.cpp
2015-05-21 22:51:21 +01:00
ocornut
7fbe6574c6
Removed unnecessary PushTextureId/PushClipRect/PopClipRect/PopTextureId on multiple Begin/End pairs
2015-05-21 22:45:32 +01:00
ocornut
8a6d543bc9
ImDrawList: merge draw command better, cases of multiple Begin/End gets merged properly
2015-05-21 22:43:28 +01:00
ocornut
6a1eba2d0a
Fixed appending multiple times to an existing child via multiple calls to same BeginChild/EndChild
2015-05-21 22:21:00 +01:00
ocornut
14ab9708be
Removed a few empty lines
2015-05-20 10:31:05 +01:00
ocornut
df276b82da
Updated FAQ for usage of ## to display empty label
2015-05-19 23:33:55 +01:00
ocornut
e43c5cd3d3
InputText: Fixed cursor generating a zero-width wireframe rectangle turning into a division by zero.
2015-05-18 23:42:12 +01:00
ocornut
0cdd050cd7
WIP Menus: fixed recycling menu level during the same frame ( #126 )
...
We could also enforce "clearing" the window and recycle immediate which
sort of work, but it would be a less tested code path.
2015-05-18 21:26:46 +01:00
ocornut
6da8a77fa3
WIP Menus: tidying up, fixed hovering in parent popup menu item from child popup (individual popups acts as hovering barrier) ( #126 )
2015-05-18 19:41:02 +01:00
ocornut
9bdacaf08d
WIP Menus: click again to toggle + allow hovering in same menuset even outside of a menubar ( #126 )
2015-05-18 19:12:36 +01:00
ocornut
75ec4841df
WIP Menus: menu opens on press (not release), uses popup style hovering, allow switch between menus at parent site ( #126 )
2015-05-18 18:44:15 +01:00
ocornut
e674df8101
Merge remote-tracking branch 'origin' into 2015-05-menus
2015-05-18 16:45:55 +01:00
ocornut
097fe51f97
Hovering require to hover same child window. Reverted 860cf578f5 (December 3), replaced by a flag resize grip.
...
Might break something if you have childs overlapping non-childs.
2015-05-18 16:42:55 +01:00
ocornut
060f879816
Tweak internal ButtonBehavior() to ease passing extra options
2015-05-18 16:39:37 +01:00
ocornut
7184de24b8
WIP Menus: scrolling section of the window is clipped by the menu bar ( #126 )
2015-05-18 15:54:56 +01:00
ocornut
a17c930d1f
WIP Menus: Added example menu, move app examples to a sub-menu ( #126 )
...
NB: menus do not react on click yet, with popup-style blocking of other
inputs yet
2015-05-17 23:19:05 +01:00
ocornut
09abf11e56
WIP Menus: BeginMenuBar() return false on window without a menu bar ( #126 )
2015-05-17 23:13:53 +01:00
ocornut
4bd43bdb35
Renamed ImGuiWindowFlags_Menu to ImGuiWindowFlags_ChildMenu
2015-05-17 22:28:57 +01:00
ocornut
7f3f3891c0
WIP Menus: fixed case where zero-sized display (e.g. minimised window) clips popups/menus and asserted ( #126 )
2015-05-17 22:15:40 +01:00
ocornut
88d7b3de23
WIP Menus: fixed hovering handling of menus from menu bars ( #126 )
2015-05-17 17:21:49 +01:00
ocornut
f2b738648f
WIP Menus: menu bars. Still inconsistency with hovering scheme. Will probably follow what Windows does. ( #126 ).
2015-05-17 17:13:45 +01:00
ocornut
6251d37987
WIP Menus: further fixes for resizing ( #126 )
2015-05-17 15:48:56 +01:00
ocornut
f44526cc45
Selectable(): horizontal filling not declared to ItemSize() so Selectable(),SameLine() works and we can best auto-fit the window
2015-05-17 13:09:46 +01:00
ocornut
e912bcb36d
Comments
2015-05-17 12:10:57 +01:00
ocornut
ecda785cbc
Popups: fix to allow child popups to be opened from a normal window without an intermediate popup window.
2015-05-15 23:57:43 +01:00
ocornut
4250357ed2
Selectable: using window->WindowPadding() to work within non-padded child windows
2015-05-15 22:39:52 +01:00
ocornut
79a95256e8
Window: fixed auto-fit calculation mismatch of whether a scrollbar will be added by maximum height clamping.
...
Also honor NoScrollBar in the case of height clamping, not adding extra
horizontal space.
2015-05-15 22:36:31 +01:00
ocornut
3115e546aa
Style editor: fixed slider for indent spacing.
2015-05-15 21:55:54 +01:00
ocornut
c1b55991c0
Window: fixed child window sizing lag + minimum size clamping lag
2015-05-15 21:40:45 +01:00
ocornut
70f83a3a65
Popups: child popups (menus) hidden on their first frame the same way as regular popup
2015-05-15 20:35:28 +01:00
ocornut
e9b6e437eb
Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering
...
Conflicts:
imgui.cpp
imgui.h
2015-05-15 17:33:04 +01:00
ocornut
1eafe86627
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
...
Conflicts:
imgui.cpp
2015-05-15 17:31:56 +01:00
ocornut
81937d34a8
Popups: made OpenPopup()/close loops reclaim focus and update popup position. It is generally a mistake but it's now more easy to understand
2015-05-15 17:29:42 +01:00
ocornut
fa0f0f4507
ImVector: tweak growth strategy
2015-05-15 13:14:46 +01:00
ocornut
1fe2906923
Metrics: do not count free(NULL) calls. Settings: contiguous allocations for ImGuiIniData.
2015-05-15 12:45:35 +01:00
ocornut
900394a612
Metrics: metrics window shows popups list
2015-05-15 12:24:05 +01:00
ocornut
222a9231bb
Examples: Console: example uses standard malloc/free, makes more sense as a copy & pastable example
2015-05-15 12:09:34 +01:00
ocornut
d9ca8f3145
Added IO.MetricsAllocs counter (number of memory allocations
2015-05-15 12:05:05 +01:00
ocornut
d9b2a90773
Popups: fixed child windows within popups vs handling of sub menus. Added examples.
2015-05-15 11:30:51 +01:00
ocornut
748072c045
Popups: identifying popups by their id to avoid conflict when recycling popup durnig same same (CloseCurrentPopup followed by Open+Begin)
2015-05-14 15:15:17 +01:00
ocornut
e57ee2852a
Comments
2015-05-14 11:32:12 +01:00
ocornut
1e4c22c206
Added io.MetricsActiveWindows counter ( #213 )
2015-05-12 16:08:34 +01:00
ocornut
5df542c3c0
ImFontAtlas: doesn't clear input data, left to the application. ( #224 )
2015-05-12 15:16:12 +01:00
ocornut
4b088ec7e8
ImFontAtlas: Fix toward allowing to add extra font without clearing existing one (need to comment out ClearInputData) ( #224 )
2015-05-12 15:10:36 +01:00
ocornut
9d9cf31972
ImFontAtlas: added ClearFonts(), making the different clear funcs more explicit ( #224 )
2015-05-12 14:53:29 +01:00
ocornut
ad79db32c7
Window title text centering tweaks, RenderTextClipped() now has different args for pos_max and clip_max #222
2015-05-12 14:02:45 +01:00
ocornut
356a37edcf
Added window title text horizontal alignment option ( #222 ),, ImGuiAlign_ type for future use.
2015-05-12 11:49:24 +01:00
ocornut
03720acaff
Merge remote-tracking branch 'origin' into 2015-05-menus
2015-05-12 10:11:14 +01:00
ocornut
9be3319653
Tweaks, comments around ImFontAtlas
...
Removed unsigned int from API
2015-05-12 09:08:47 +01:00
ocornut
9e307d60e3
Merge remote-tracking branch 'origin' into 2015-05-menus
2015-05-11 21:45:13 +01:00
ocornut
515e0c6122
Cleanup, merged duplicate code into a function
2015-05-11 21:44:50 +01:00
ocornut
317744489f
WIP Menus: sub-menu arrow alignment take account of extension by other widgets ( #126 )
2015-05-11 20:58:07 +01:00
ocornut
5082182790
Merge remote-tracking branch 'origin' into 2015-05-menus
...
Conflicts:
imgui.h
2015-05-11 20:39:19 +01:00
ocornut
ba7a4fc034
WIP Menus: minor cleanup using a ImGuiSimpleColumns helper type ( #126 )
2015-05-11 20:34:52 +01:00
ocornut
7fb704d308
WIP intermediary branch commit for menus, submenus (some large inconsistencies remaining in API + need cleanup) ( #126 )
...
May remove the ImGuiWindowFlags_Menu alltogether
2015-05-11 19:52:02 +01:00
ocornut
79198fd6a5
Default item width for AlwaysAutoResize windows expressed as a factor of font height
2015-05-11 19:47:01 +01:00
ocornut
34aad73fd8
Added ImGuiCol_TextDisabled
2015-05-11 19:36:32 +01:00
ocornut
141ac8beab
Tweaks
2015-05-11 18:28:30 +01:00
omar
33a2fd368a
Merge pull request #218 from paperManu/inputNFlags
...
InputFloat2/3/4, InputInt2/3/4: Added extra_flags parameter.
2015-05-11 16:54:12 +01:00
Emmanuel Durand
b3faed610d
Renamed flags to extra_flags in last commit
2015-05-11 11:40:08 -04:00
ocornut
fcd08ed8d4
BeginPopup() API had to be changed! :( Proper support for stacked popups, leading into menus (wip #126 )
2015-05-11 15:57:02 +01:00
Emmanuel Durand
94b7c9e307
Input text flags added to InputFloatN and InputIntN
2015-05-11 10:15:22 -04:00
Stefano Cristiano
99a1a85f1f
Example fix PopStyleVar on Vertical Slider to avoid assertion
...
Adding an explicit ImGui::PopStyleVar to avoid assertion in
CheckStacksSize
2015-05-11 14:45:49 +02:00
ocornut
4a41ce9414
InputText: make sure Ctrl+V has ONLY the control key pressed (follow up to #214 ) + tidying
2015-05-11 09:29:10 +01:00
ocornut
c2c43928a9
Untabifiy
2015-05-11 09:26:53 +01:00
ghassanpl
bb2d3a8b41
* make sure letter-key shortcuts have ONLY the control key pressed (fixes bug for AltGr->Ctrl+Alt on windows)
2015-05-10 22:41:28 +02:00
ocornut
6c1084eaa1
Shutdown() test for g.IO.Fonts not being NULL to allow workarounds in case of using multiple contexts #207
2015-05-09 10:27:03 +01:00
ocornut
f293bec97c
Added style.ScrollbarRounding #212
2015-05-09 10:13:56 +01:00
ocornut
d23709ce35
Merge remote-tracking branch 'origin' into 2015-05-menus
2015-05-09 10:02:48 +01:00
ocornut
9fe654c6e4
Assert on modifiers stack size mismatch between Begni()/End() pairs #204
...
Experimenting with this. It's helpful but not happy with the idea of
ImGui asserting on that sort of user error.
2015-05-09 09:59:46 +01:00
ocornut
debe6522bb
Examples: test for tooltip over popup.
2015-05-07 19:00:17 +01:00
ocornut
33e8fb85cf
Allow stacking popups, not really useful yet (wip #126 )
2015-05-07 18:43:08 +01:00
ocornut
dd2a578012
Added ImGuiSetCond_Appearing to test the hidden->visible transition.
2015-05-07 18:39:23 +01:00
ocornut
f46557d2d6
MenuItem() draft for popups, with Selected option (wip #126 )
2015-05-07 17:21:48 +01:00
ocornut
c36172ebef
Tweak RenderCheckMark()
2015-05-07 17:11:32 +01:00
ocornut
85b8967291
Added RenderCheckMark() helper following the font size
...
Pretty ugly, not sure what's the right way to solve that automatically,
better shown as an "icon" so it doesn't have to necessarily look like
the font.
2015-05-07 17:06:07 +01:00
ocornut
13c3f11c66
Comments ( #209 )
2015-05-07 11:36:16 +01:00
ocornut
fbbe7fee53
Fix "Debug" window stealing focus/popup #208 #209 @thevaber
2015-05-07 11:24:51 +01:00
ocornut
25d8c1af91
Removed inline marker #210
2015-05-07 10:48:05 +01:00
ocornut
e7ffcea33d
Removed style.AutoFitPadding, using style.WindowPadding makes more sense (the default values were already the same).
2015-05-03 14:26:47 +01:00
ocornut
b1b23d6ca9
Autofit cancel out one worth of vertical spacing for correct symmetry (group and tooltip already do that)
2015-05-03 13:52:53 +01:00
ocornut
0ca7926b94
Popup auto-border doesn't spread to its childs #197
2015-05-03 13:04:43 +01:00
ocornut
a3a10d4a3c
Popup have borders by default #197 attenuated border alpha in default theme
2015-05-03 12:17:53 +01:00
ocornut
47e875314b
Plot: overlay label clipped within frame when bigger than frame
2015-05-03 11:32:39 +01:00
ocornut
f00662a5ad
Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering
2015-05-02 22:20:48 +01:00
ocornut
08fd6a7e7d
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
...
Conflicts:
imgui.cpp
2015-05-02 22:20:14 +01:00
ocornut
d84b5737a6
Popups, Tooltips: fit within display. Hidden during size calculation. Fixed popups flicker when changing size.
...
Big change, needed reorder of Begin(). May trigger new bugs.
2015-05-02 18:22:46 +01:00
ocornut
99e315d2b2
Fix for width of child windows with scrollbar (broken 376a6a5af0)
2015-05-02 18:14:24 +01:00
ocornut
221f36e116
Comments, tweaks, metrics window tweak
2015-05-02 17:54:25 +01:00
ocornut
a3560b274e
Tidying up Begin(): using local copy of 'flags' for brevity
2015-05-02 17:45:54 +01:00
ocornut
6ca4b31bf8
Fixed popup resizing (broken 376a6a5af0)
2015-05-02 15:54:35 +01:00
ocornut
a906738ba7
Renamed Visible->Active internally
2015-05-02 13:20:50 +01:00
ocornut
1b5795c96d
InputText: fixed incorrect edit state after text buffer is modified by user through callback #206
2015-05-02 12:45:53 +01:00
ocornut
81bf614821
Fix window size after collapsing (broken 376a6a5af0)
2015-05-02 12:35:34 +01:00
ocornut
7fac4013a4
Build fix
2015-05-02 12:22:52 +01:00
ocornut
4e292bf67d
Tidying up Begin(): separated blocks needed for auto-resize so it can be moved above position calculation later
2015-05-02 12:20:06 +01:00
ocornut
376a6a5af0
Tidying up Begin() separated blocks needed for auto-resize so it can be moved above position calculation later
...
Being cautious again. Hopefully didn't break anything.
2015-05-02 12:08:24 +01:00
ocornut
46f55fe6f6
Tidying up Begin()
2015-05-02 10:46:24 +01:00
ocornut
3f7f256752
Tidying up. Re-arranged the (first_begin_of_the_frame) blocks in Begin() for further changes.
...
Being cautious.
2015-05-02 10:32:32 +01:00
ocornut
19f7bf90f8
Examples: AutoResize demo doesn't use TextWrapped()
2015-05-01 21:01:54 +01:00
ocornut
07ebb14ce2
Tooltip: fit within display. Added style.DisplayWindowPadding, style.DisplaySafeAreaPadding now strictly for popups/menus.
2015-05-01 20:35:44 +01:00
ocornut
68ccdc4fb8
Comments
2015-05-01 11:07:30 +02:00
ocornut
8fbb42cc6f
Added IsKeyDown() IsMouseDown() as convenience instead of reading into IO structures
...
Also their existence serves as implicit documentation of what
IsKeyPressed(), IsMouseClicked() does
2015-04-28 18:12:24 +02:00
ocornut
2440a30444
Columns() distinguish columns-set ID from other widgets as a convenience, added asserts, added more sailors
2015-04-28 18:09:38 +02:00
ocornut
bd23c11a93
Separator() within group start on group horizontal offset #205
2015-04-27 22:19:14 +02:00
ocornut
1d90f099bd
Tidying up
...
We still have an issue with ImVec4 vs ImRect
2015-04-26 13:17:56 +02:00
ocornut
6844952d56
Fixed build with Visual Studio 2008 or earlier (via PR #203 )
2015-04-24 09:22:29 +02:00
ocornut
c93a562b06
Added ImGuiStorage::GetVoidPtrRef()
2015-04-21 10:12:17 +01:00
ocornut
9119f58ce5
Version number 1.39 WIP
2015-04-21 10:09:20 +01:00
ocornut
37d8d78fc2
Selectable() render into AutoFitPadding only when full-fitting (fix aac99819d6)
2015-04-19 23:37:50 +01:00
ocornut
064b94721e
Added DragFloat2, DragFloat3, DragFloat4, DragInt2, DragInt3, DragInt4.
2015-04-19 23:28:57 +01:00
ocornut
94c4e9564d
Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering
2015-04-19 23:00:14 +01:00
ocornut
86d1abf3f6
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
2015-04-19 22:59:53 +01:00
ocornut
05ee36baab
Version number 1.38
2015-04-19 22:59:27 +01:00
ocornut
85e18c72d2
ShowTestWindow(): drag example + tooltip.
2015-04-19 22:57:39 +01:00
ocornut
731b003c9d
Slider internals: removed unnecessary slider_bb parameter
2015-04-18 19:34:05 +01:00
ocornut
acbd58627f
ShowTestWindow(): added a custom label in the format for one of the slider example.
2015-04-18 17:35:40 +01:00
ocornut
c46d5634d4
Columns: mouse dragging uses absolute mouse coords. Fixed dragging left-most column of an auto-resizable window. #125
2015-04-18 13:46:28 +01:00
ocornut
c82f909be1
Active column (when dragged) not clipped so it can release its active state (extends 16ddd796f3)
2015-04-18 12:11:59 +01:00
ocornut
26e469af22
Documentation
2015-04-18 09:19:41 +01:00
ocornut
02de9bd859
DragFloat, DragInt: if step/speed is zero defaults to 1% of range #180
2015-04-17 10:01:39 +01:00
ocornut
4f1acf0d4a
Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering
...
Conflicts:
imgui.cpp
2015-04-17 08:42:36 +01:00
ocornut
1847270a5f
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
2015-04-17 08:41:16 +01:00
omar
6408ac482c
Merge pull request #199 from bkaradzic/master
...
Fixed C4267 size_t to unsigned int conversion warning.
2015-04-17 08:09:07 +01:00
Branimir Karadžić
6920e70e2e
Fixed C4267.
2015-04-16 15:52:35 -07:00
ocornut
7fde17e15a
ShowMetricsWindow(): renaming locals (not sure about the "shadows a local variable" warning?)
2015-04-16 23:30:48 +01:00
Branimir Karadžić
508d05414a
Fixed warning: missing initializer for member.
2015-04-16 14:45:42 -07:00
Branimir Karadžić
b7b3df3c81
Fixed: warning: declaration shadows a local variable
2015-04-16 14:42:17 -07:00
Branimir Karadžić
d24474ea82
Fixed: warning: missing field 'w' initializer [-Wmissing-field-initializers]
2015-04-16 14:39:04 -07:00
ocornut
64db50ba46
TODO list
2015-04-16 10:58:30 +01:00
ocornut
aca85dbea4
Fixed hovering over a popup's child (popups disable hovering on other windows but not their childs) #197
2015-04-16 10:54:56 +01:00
ocornut
de3a154f38
Tweak date/credits
2015-04-14 12:00:12 +01:00
ocornut
43cb4038c6
Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering
...
Conflicts:
examples/directx11_example/imgui_impl_dx11.cpp
imgui.cpp
2015-04-14 09:51:28 +01:00
ocornut
0bb89ccee2
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
...
Conflicts:
imgui.cpp
2015-04-14 09:49:04 +01:00
ocornut
dd36e8bf2b
Renamed IsClipped() to IsRectClipped(). Kept inline redirection function (will obsolete).
2015-04-13 22:04:28 +01:00
ocornut
d11b4160aa
Added IsItemVisible(). Made IsClipped() also return false when log is enabled.
2015-04-13 21:52:38 +01:00
ocornut
16ddd796f3
Active widgets is not clipped, so it can always release its active state (mentioned in #143 )
...
Otherwise a change in layout moving active widget to a clipped region
may lock the active id.
2015-04-13 20:59:44 +01:00
ocornut
9918ec31d6
Added ResetMouseDragDelta() for iterative dragging operations
2015-04-13 19:54:40 +01:00
ocornut
a143e2e772
Added PushId() GetId() variants that takes string range to avoid user making unnecessary copies
2015-04-13 14:45:27 +01:00
ocornut
750b6c9224
DragFloat() fixed clamping #180
2015-04-13 00:07:41 +01:00
ocornut
6ed06a8dc8
DragFloat() added power parameter for logarithmic drag on both side of zero #180
2015-04-13 00:03:57 +01:00
ocornut
f5ad362912
DragFloat() latch value internally, allows finer control, honor precision settings, slow step with integer works #180
2015-04-12 19:15:55 +01:00
ocornut
b308d2728b
Remove stray tabs
2015-04-12 10:45:00 +01:00
ocornut
adae98664e
Comment on the newly added binary_to_compressed_c.cpp helper program
2015-04-12 10:31:10 +01:00
ocornut
88725be381
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
...
Conflicts:
imgui.cpp
2015-04-11 18:13:43 +01:00
ocornut
7ca21a1bc2
Fixed prototypes
2015-04-11 18:12:11 +01:00
ocornut
ac740170b9
Added ImFontAtlas::AddFontFromCompressedTTF() helper + binary_to_compressed_c.cpp tool
2015-04-11 18:00:09 +01:00
ocornut
bff9a6b6e3
Added ImFontAtlas::AddFontFromCompressedTTF() helper + binary_to_compressed_c.cpp tool
2015-04-11 17:52:51 +01:00
ocornut
c3a71f5472
AA branch: Minor optimisation merge + thickness for non-aa strokes.
2015-04-09 23:00:55 +01:00
ocornut
dbc9b2ec9b
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
...
Conflicts:
imgui.cpp
2015-04-09 22:56:13 +01:00
ocornut
6bdb8719e2
Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering
2015-04-09 22:50:18 +01:00
ocornut
a48130b682
ImDrawList: Minor optimisation.
2015-04-09 22:49:18 +01:00
ocornut
e0cd947904
AA branch: Fixes.
2015-04-09 22:40:50 +01:00
ocornut
1e69175403
AA branch: Test disabling aa at runtime for stroke and fill.
2015-04-09 22:31:26 +01:00
ocornut
431e391ccd
AA branch: fixed circles.
2015-04-09 21:51:33 +01:00
ocornut
dd893ac4f5
Warning fix.
2015-04-09 21:43:42 +01:00
ocornut
14ddb81f7a
AA branch: remove code unnecessary for this branch.
2015-04-09 21:39:56 +01:00
ocornut
39445cf23a
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
...
Conflicts:
imgui.cpp
imgui.h
2015-04-09 21:38:30 +01:00
ocornut
1746b04065
Indexed rendering. Not in main branch because breaks rendering code too much. Will merge in trunk along with more major graphics changes lat
2015-04-09 21:05:35 +01:00
ocornut
500a8a0e02
ImDrawList: bits of renaming.
2015-04-09 21:00:45 +01:00
ocornut
4fa3eee84e
Renamed io.MetricsVertices to io.MetricsRenderVertices
2015-04-09 19:47:41 +01:00
ocornut
aa1a96f907
ImDrawList: inline AddVtx() calls for profit in highly debug builds
2015-04-09 18:34:31 +01:00
ocornut
707df6c7b7
ImDrawList: internal refactoring toward a following commit for indexed rendering.
2015-04-09 17:32:03 +01:00
ocornut
742808d835
Tweaks.
2015-04-09 17:24:09 +01:00
ocornut
15f82e0deb
Fix rounded frames to follow previous change
2015-04-09 17:20:57 +01:00
ocornut
aa2935968e
Renamed AddArcFast() parameter 'tris' to 'filled'
2015-04-09 16:47:20 +01:00
ocornut
f38cca09cf
Merge branch 'master' of https://github.com/ocornut/imgui
2015-04-09 16:45:21 +01:00
ocornut
0fc1f5b17f
Revert AddArcFast()->AddArc(), removed modulo from function 200d3482dc
2015-04-09 16:45:14 +01:00
Stephan Dilly
2bb6e31520
fix unused variable warning by clang
2015-04-09 16:50:54 +02:00
ocornut
200d3482dc
Renamed ImDrawList::AddArc() to ImDrawList::AddArcFast() for compatibility with future API, and changed 2*PI range from 0..12 to 0..16
2015-04-09 00:49:21 +01:00
ocornut
13fab08cdb
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
2015-04-08 20:37:18 +01:00
ocornut
3c6257b8b9
Fixed IsRootWindowOrAnyChildFocused() crashing if no window has focus (introduced yesterday in c38c54af52)
2015-04-07 14:04:43 +01:00
ocornut
6e99688fa7
Fixed user-facing version of IsItemHovered() ignoring overlapping windows
2015-04-07 14:03:17 +01:00
ocornut
323ae8326e
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
2015-04-07 13:51:01 +01:00
ocornut
d692286862
Added ShowMetricsWindow()
2015-04-07 13:42:35 +01:00
ocornut
8211081c54
Added (not exposed) DisableHideTextAfterDoubleHash to disable ## processing.
2015-04-07 13:37:30 +01:00
ocornut
33ef3992f7
Added IO.MetricsVertices counter
2015-04-07 13:36:11 +01:00
ocornut
6e4d3dac1a
Examples: Fixed ShowExampleAppManipulatingWindowTitle() not doing the right thing, broken in ff35d24bcc
2015-04-07 11:54:53 +01:00
ocornut
c38c54af52
Clicking on void loses keyboard-focus so application can use TAB back
2015-04-06 11:25:07 +01:00
ocornut
fe64da6197
Allow SetWindowFocus(NULL) to remove focus
2015-04-06 11:19:31 +01:00
ocornut
28a45877aa
DragFloat() comment examples, not ready for prime-time #180
2015-04-03 16:21:24 +01:00
ocornut
c93f34238e
DragFloat() examples #180
2015-04-03 15:18:12 +01:00
ocornut
962aa4c396
DragFloat() double-clicking turns into an input box (along with Ctrl+clicking) #180
2015-04-03 15:15:12 +01:00
ocornut
916a8955ec
DragFloat(): passing min>=max (e.g. 0.0f) for range makes the drag unbound #180 , removed extra APIs
2015-04-03 15:13:59 +01:00
ocornut
61d886e14b
SliderFloat() removed support for unbound/infinite slider, inconsistent. Use InputFloat()/DragFloat()
2015-04-03 15:10:07 +01:00
ocornut
aac99819d6
Selectable() render into AutoFitPadding but do not extend it, fixing small visual gap
...
Followup 2e26196aba#1
2015-04-03 14:40:15 +01:00
ocornut
f3967f1183
Combo() adding frame padding inside the combo box.
2015-04-03 14:32:46 +01:00
ocornut
dc52938627
InputInt2(), InputInt3(), InputInt4(): fixed label vertical alignment
2015-04-03 14:22:00 +01:00
ocornut
f7e35ce120
ShowTestWindow() renamed sliders examples to say "slider"
2015-04-03 14:20:04 +01:00
ocornut
1247ce251f
Added DragFloat(), DragInt() work in progress #180
2015-04-03 14:07:52 +01:00
ocornut
6aed651f77
ColorEdit4(): tweak code to be a little less ugly (still not a beauty contest winner..)
2015-04-03 11:49:02 +01:00
ocornut
2d157d3af0
ColorEdit4(): hide components prefix if there's no space for them.
2015-04-03 11:25:44 +01:00
ocornut
e6792f84d4
Comments and organization of imgui.h
2015-04-03 10:22:18 +01:00
ocornut
153db91917
Slider: don't call RenderText() on empty label.
2015-04-02 22:39:37 +01:00
ocornut
74f2e53b3b
Slider: fix in the unlikely case that style.GrabMinSize is larger than a slider.
2015-04-02 22:38:37 +01:00
ocornut
31fd72bde1
Internal renaming
2015-04-02 21:21:35 +01:00
ocornut
503b8c20de
Delete font clear pointer in ImGui state to get a clear crasah instead of a dangling pointer. #181
2015-04-02 17:48:22 +01:00
ocornut
b61b311772
Fixed Begin() returning true on collapsed windows that loaded settings #176
2015-04-02 10:56:59 +01:00
ocornut
a4cf50affe
Fix uninitialized fields - MouseCursor set by first call to NewFrame()
2015-04-01 15:08:42 +01:00
ocornut
c0699958ce
Fix for Coverity static analysis
2015-04-01 15:05:06 +01:00
ocornut
eb3e640fa6
Fixed style.DisplaySafeAreaPadding handling from being applied on window that never were auto-fit
2015-03-31 00:41:15 +01:00
ocornut
468fcd7b30
Fixed mouse wheel scrolling (broken 2 commits ago 9d16b85ed2)
2015-03-31 00:15:23 +01:00
ocornut
6ba7a74191
AA branch: fix.
2015-03-30 23:57:29 +01:00
ocornut
bb385fabd4
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
2015-03-30 23:55:40 +01:00
ocornut
0a31531f44
Warning fix in demo code
2015-03-30 21:16:24 +01:00
ocornut
9d16b85ed2
Caching current Font, FontSize into state for quicker/simpler access.
2015-03-29 19:45:03 +01:00
ocornut
e16f2e898a
Version number 1.38 WIP
2015-03-29 10:09:14 +01:00
ocornut
ff35d24bcc
Comments
2015-03-27 19:34:01 +00:00
ocornut
4ee5a792ff
Fixed new collapsed auto-resizing window with saved .ini settings not calculating their initial width #176
2015-03-27 15:18:45 +00:00
ocornut
26991bb2ec
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
...
Conflicts:
imgui.cpp
imgui.h
2015-03-26 22:09:35 +00:00
ocornut
2e26196aba
Selectable() fixed misuage of GetContentRegionMax().x
2015-03-26 21:13:03 +00:00
ocornut
a1582874d3
Changed new ImDrawList::AddLine() half_thickness to hickness, just in time for release
2015-03-26 20:24:55 +00:00
ocornut
729e524955
Version number 1.37
2015-03-26 20:16:53 +00:00
ocornut
bcd85e7cd6
Auto contents size aware of enforced vertical scrollbar if window is large than display height.
2015-03-26 20:14:15 +00:00
ocornut
e1de4908f6
Removed bool return value from BegniPopup() at the moment, it is meaningless. Tidying up.
2015-03-26 19:18:06 +00:00
ocornut
4b7818dfc2
Bounding box tests exclude higher bound, so touching items (zero spacing) don't report double hover when cursor is on edge
2015-03-26 19:05:47 +00:00
ocornut
c6112550eb
Added Haddock in the (popup) Aquarium
2015-03-26 19:02:54 +00:00
ocornut
f5ba64d8cd
Sorting of windows for render doesn't do 3 pass stupidly. Made code a little closer to what it should become with a layering system
2015-03-26 18:51:45 +00:00
ocornut
93c9777165
Fix for using tooltips within popup #126 - will need to rewrite the sorting/layering system shortly.
2015-03-26 18:17:55 +00:00
ocornut
a3086f40fe
Renamed internal RenderSortedWindows -> WindowsSortBuffer + cleanup popup closing code
2015-03-26 18:01:40 +00:00
ocornut
fc25d71f84
Refactored duplicated code into an inline function & made more readable
2015-03-26 17:45:11 +00:00
ocornut
a4dc775339
Fixed hovering bug introduced in ac2da570 when popup is inactive #126
2015-03-26 17:35:52 +00:00
ocornut
5fe4ae62cb
Popup: clicking on empty space also close popup #126
2015-03-26 17:24:05 +00:00
ocornut
ac2da570f5
When a popup window is open it inhibit hovering on other windows #126
2015-03-26 17:17:42 +00:00
ocornut
de7552047b
Simplified example
2015-03-26 17:11:14 +00:00
ocornut
91f8eb7b92
Added early version of BeginPopup/EndPopup() #126
2015-03-26 17:09:17 +00:00
ocornut
d3e8e15e41
Added popup demo code (commented out because I expect to make popup menu proper citizens by next version)
2015-03-26 16:45:44 +00:00
ocornut
325e292427
Selectable(): not specifying a width default to using max of label width and remaining width
2015-03-26 16:41:52 +00:00
ocornut
3268646180
Fixed clipping rectangle's own clipping #177
2015-03-26 16:28:41 +00:00
ocornut
743c815821
Renamed IsItemHoveredRectOnly -> IsItemHoveredRect (introduced after previous release)
2015-03-26 16:18:01 +00:00
ocornut
8b7668d24f
Avoid negative clipping rectangle when collapsing windows, ImDrawList could still submit data #177
2015-03-26 16:03:30 +00:00
ocornut
b04ee7e040
Added a more convenient three parameters version of Begin() which Flags more accessible.
2015-03-23 22:50:17 +00:00
ocornut
9d4ba2e27d
Using SetNextWindowSize() in examples to encourage its use
2015-03-23 22:45:05 +00:00
ocornut
c9430bb807
Fixed new windows auto-fitting bigger than their .ini saved size
2015-03-22 17:22:39 +00:00
ocornut
b578e86971
Fixed SetWindowPos/SetNextWindowPos affectiving size computation ( #175 )
2015-03-22 16:08:42 +00:00
ocornut
5737a79c8d
Fixed new window from having an incorrect content size on their first frame ( #175 )
2015-03-22 15:58:44 +00:00
ocornut
7e8f1f1062
Collapsed windows run initial auto-fit to resize the title bar #175
...
Maybe have side-effects on window contents? Unsure at this point.
2015-03-22 15:34:41 +00:00
ocornut
efd927e300
ShowTestWindow: missing TreePop() call in Mouse Cursor section.
2015-03-22 00:00:49 +00:00
ocornut
99314dad73
Updated FAQ
2015-03-21 23:14:21 +00:00
ocornut
072c57b0ca
Setting io.LogFilename to NULL disable default LogToFile() (part of #175 )
2015-03-21 19:30:46 +00:00
ocornut
85f432dc8d
Commented standard library include with the functions we use. Using ImFormatString in place of sprintf (part of #172 )
2015-03-21 19:27:29 +00:00
ocornut
7c8946b9b7
Hovering a column set the resize <> mouse cursor #155
2015-03-21 17:48:03 +00:00
ocornut
dee2790133
Mouse cursor offset tweak #155
2015-03-21 15:12:47 +00:00
ocornut
9363e6c154
Prepacking mouse cursors to save on source code size, generally simpler #155
2015-03-21 15:09:01 +00:00
ocornut
810fcd8bcb
Added mouse cursor types handling + embed mouse cursor data #155
2015-03-21 13:59:19 +00:00
ocornut
ff1040a38d
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
2015-03-21 10:55:31 +00:00
ocornut
7f49ac0407
Disabled -Wmissing-noreturn warning for Clang a bit reluctantly - will put back when removing GetDefaultFontData() #173
2015-03-21 10:14:10 +00:00
ocornut
bae32567c3
Fixed unused parameter warning with empty IME handler #173
2015-03-21 10:04:10 +00:00
ocornut
8f90238e53
Fixed IMGUI_DISABLE_TEST_WINDOWS #169
...
Fixed warning
2015-03-21 10:03:03 +00:00
ocornut
d77082af00
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
2015-03-21 00:54:31 +00:00
ocornut
92a22ab35f
Shutdown() freeing a few extra vectors so they don't have to freed by destruction #169
2015-03-21 00:41:34 +00:00
ocornut
c0eab2a164
Moved draw list for io.MouseDrawCursor to state ( #169 )
2015-03-21 00:22:36 +00:00
ocornut
c18a409a97
Auto-filling child window feed their content size to parent - hopefully fix more problem than it causes? #170
2015-03-20 23:34:03 +00:00
ocornut
6699ccfd1f
Tweaked IMGUI_DISABLE_TEST_WINDOWS so it doesn't show in ImGui.h
2015-03-20 22:52:32 +00:00
ocornut
5600ef9701
Merge branch 'allow-to-disable-test-window' of https://github.com/mmozeiko/imgui into mmozeiko-allow-to-disable-test-window
2015-03-20 22:50:07 +00:00
ocornut
5f914c9cbe
Comment
2015-03-20 21:06:45 +00:00
ocornut
60f3cfbe98
Fixed MouseDrawCursor feature submitting an empty trailing command in the draw list
...
+ Merged 4 draw calls into one, should be merged at lower level.
2015-03-20 20:50:55 +00:00
unknown
2142181c51
Allow to disable help and test window functionality
2015-03-20 12:08:00 -07:00
ocornut
efeeba99ca
Tweak stb_textedit integration to be lenient if another user are leaking their STB_TEXTEDIT definitions/symbols
2015-03-20 14:03:23 +00:00
ocornut
876a755bac
Removed unnecessary assert (will crash well enough without) + comment
2015-03-20 11:22:26 +00:00
ocornut
4cd438f663
Added IsMouseDragging(), GetMouseDragDelta() given button and lock threshold. added io.MouseDragThreshold setting. ( #167 )
...
Removed GetItemActiveDragDelta()
2015-03-20 11:13:18 +00:00
ocornut
c070314621
Reverted 11025b3160, 129339adb0 it breaks collapsing implicit debug window
2015-03-20 10:54:21 +00:00
ocornut
2d81a73f85
Double-clicking on resize grip doesn't keep grip active if mouse button is kept held.
2015-03-20 10:51:33 +00:00
ocornut
2d29907611
Added GetMouseDragDelta() helper. No unlock threshold yet ( #167 )
2015-03-20 10:49:17 +00:00
ocornut
a71fc8e6a5
Fixed MouseClickedPos not updated on double-click update ( fix #167 )
2015-03-20 10:46:07 +00:00
Martins Mozeiko
8a553cdcbe
Replace assert with IM_ASSERT in few places.
2015-03-19 19:36:17 -07:00
ocornut
282532a92a
AA Branch: notes.
2015-03-19 17:04:50 +00:00
ocornut
138e292c4b
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
...
Conflicts:
imgui.cpp
imgui.h
2015-03-19 17:01:54 +00:00
ocornut
ff5378bd66
InputText() last active preserve scrolling position. Reset scroll if widget size becomes bigger than contents.
2015-03-19 16:45:37 +00:00
ocornut
d1aca79f4e
InputText() update its width in case of resize initiated programmatically
2015-03-19 16:40:59 +00:00
ocornut
693bd56db2
InputText() removed the odd ~ characters when clipping. Tweaks and fixes of clipping.
2015-03-19 16:04:22 +00:00
ocornut
6e5130ddf4
ShowTestWindow: Added Wdigets Alignment demo under Layout section
2015-03-19 15:10:43 +00:00
ocornut
129339adb0
Removed 'Accessed' flag from ImGuiWindow so GetCurrentWindow() compiles to a simpler accessor
2015-03-19 15:03:10 +00:00
ocornut
11025b3160
Implicit "Debug" window hide itself based on cursor extend instead of the 'Accessed' flag.
2015-03-19 15:01:07 +00:00
ocornut
d953f8d99a
ShowTestWindow: Graph checkbox under the label, also demo using BeginGroup/EndGroup()
2015-03-19 14:49:58 +00:00
ocornut
2f0fb2bc34
IsItemhovered() include label and behave consistently ( #145 )
2015-03-19 14:48:36 +00:00
ocornut
314b87dfaf
InputFloat(): fixed label alignment if total widget width forcefully bigger than space available
2015-03-19 14:15:51 +00:00
Josh Simmons
6425b8c1cf
Remove spurious assert
...
Remove nop assert that causes warnings on Clang.
2015-03-19 22:42:17 +11:00
ocornut
2a04c2a7bb
Fix warnings
2015-03-19 09:33:43 +00:00
ocornut
13caf21018
Use fabs() instead of abs() to ensure we use floating point. #164
2015-03-19 09:06:34 +00:00
ocornut
7a2da7cd02
Added style.DisplaySafeAreaPadding which was previously hard-coded (for use if you can't see the edges of your display, e.g. TV screens)
2015-03-18 22:35:51 +00:00
ocornut
62e8661a37
Fixed assignment order in Begin() making auto-fit size effectively lag by one frame
...
Also disabling "clamp into view" while windows are auto-fitting
2015-03-18 22:35:50 +00:00
ocornut
d45d1d1bca
Documentation tweaks and fixes
2015-03-18 19:00:03 +00:00
ocornut
ed0f0dbe87
ImDrawList::AddText() takes a const ImFont*
2015-03-18 14:58:17 +00:00
ocornut
bc88ed0cb9
Fixed bounding measurement of empty groups ( fix #162 )
2015-03-18 13:21:32 +00:00
ocornut
e14c7e5510
ShowTestWindow(): Added simple dragging widget example.
2015-03-18 13:15:11 +00:00
ocornut
dcaafffe0e
Added CalcItemRectClosestPoint() helper.
2015-03-18 13:07:37 +00:00
ocornut
9f1b407def
ImDrawList: added thickness param to AddLine(). Added PushClipRectFullScreen() helper.
2015-03-18 12:54:44 +00:00
ocornut
7d26e85b05
IsItemHovered() return false if another widget is active. Added IsItemHoveredRectOnly().
2015-03-18 12:10:26 +00:00
ocornut
e10d648a28
Added ImGui::GetItemActiveDragDelta() helpers for drag operations
2015-03-18 10:41:46 +00:00
ocornut
215b0065e3
Version number 1.37 WIP
2015-03-18 10:24:56 +00:00
ocornut
7665b8e5e7
Version number
2015-03-18 09:39:38 +00:00
ocornut
d8026e4d84
Added VSliderInt()
2015-03-18 09:39:09 +00:00
ocornut
2a9a2918f8
ShowTestWindow(): more examples of SameLine() usage
2015-03-18 00:07:21 +00:00
ocornut
9c489a081c
ShowTestWindow(): added vertical sliders examples, tweaks.
2015-03-17 23:58:22 +00:00
ocornut
be83c07957
Changed mentions of 'box' to be 'rect'
2015-03-17 23:41:20 +00:00
ocornut
7e6112bf26
Changed remaining mentions of 'aabb' to be 'rect'
2015-03-17 23:37:17 +00:00
ocornut
302316c6cf
Renamed internal type ImGuiAabb to ImRect
2015-03-17 23:35:12 +00:00
ocornut
7e297945c3
Added BeginGroup() / EndGroup() layout tools ( #160 )
2015-03-17 23:28:57 +00:00
ocornut
da4bfe3289
Added GetItemRectSize(). Renamed GetItemRectMin()/GetItemRectMax()/IsMouseHoveringBox() to GetItemRectMin()/GetItemRectMax()/IsMouseHovering
2015-03-17 22:36:54 +00:00
ocornut
2e63bf1d16
Button() doesn't add frame padding an explicit size
2015-03-17 22:27:00 +00:00
ocornut
30bc952ac3
Maintaining DC.CursorMaxPos instead of SizeContentsCurrent, simpler, faster and easier to understand.
2015-03-17 22:03:02 +00:00
ocornut
fd7f50d269
Various fixes related to vertical alignment of text after widget of various sizes. Added demos. Toward #160
...
Also fixed LabelText() height.
2015-03-17 20:17:53 +00:00
ocornut
3bd5597cee
Moved text vertical centering out of ItemSize() for the moment, in TextUnformatted() it's only user
2015-03-17 17:17:00 +00:00
ocornut
bbaf7e2eee
Internal tweaks
2015-03-17 16:40:47 +00:00
ocornut
fe2809fecc
Changed default Border and Column border colors to be most subtle, less MS-DOS
2015-03-17 16:16:15 +00:00
ocornut
7e00a41f1b
Speculative warning fix
2015-03-16 18:04:51 +00:00
ocornut
cb285c4d35
Examples: uses SetNextWindowPos/SetNextWindowSize when applicable
2015-03-16 11:53:36 +00:00
ocornut
ea720963cf
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
2015-03-16 10:21:25 +00:00
ocornut
f4970d0e00
Moved static buffers into state
...
No recursion in any of those functions. Tho keeping a lock api may be
preferable?
2015-03-16 09:54:28 +00:00
ocornut
733eedc477
Moved static buffer into state
2015-03-16 09:45:32 +00:00
ocornut
d08ce58876
TreeNodeV() early out if SkipItems is set (avoid formatting string only to be discarded later)
2015-03-16 00:46:03 +00:00
ocornut
0fc9168439
Added InputInt2(), InputInt3(), InputInt4()
2015-03-15 11:30:00 +00:00
ocornut
9c6c8a1ab9
ShowTestWindow() using Unindent() / Indent() instead of an explicit TreePop
2015-03-15 11:21:59 +00:00
ocornut
44826972c0
Added Indent(), Unindent()
2015-03-15 11:19:10 +00:00
ocornut
edde703f8f
Renamed style.TreeNodeSpacing to style.IndentSpacing, ImGuiStyleVar_TreeNodeSpacing to ImGuiStyleVar_IndentSpacing
2015-03-15 11:10:48 +00:00
ocornut
304d19a0d8
ShowTestWindow() added multi-components sliders in a sub-node
...
+ right align all widgets
2015-03-15 11:03:55 +00:00
ocornut
b443c7ebe9
Tweak VSliderFloat()
...
Not really happy about them
2015-03-15 10:38:19 +00:00
ocornut
1ac4f33736
Added VSliderFloat()
2015-03-15 01:58:14 +00:00
ocornut
7019cb10f7
"behaviour" -> "behavior" to behave like the greatest number
2015-03-15 01:48:59 +00:00
ocornut
c1547dd79e
Internal SliderBehaviour() function now supports vertical sliders
2015-03-15 01:47:12 +00:00
ocornut
ce8150ce69
Slider fix hovering bounding test excluding padding between outer frame and grab
2015-03-15 01:36:29 +00:00
ocornut
6da83cd5b7
Plot: size provided to PlotHistogram(), PlotLines() include the padding (sorry users).
2015-03-15 01:27:37 +00:00
ocornut
98eeeab025
Added ImGuiStyleVar_GrabMinSize enum value for PushStyleVar()
2015-03-15 01:23:56 +00:00
ocornut
1ef789bb68
Slider code tweaks, split into a SliderBehaviour() function
2015-03-14 23:55:07 +00:00
ocornut
ce87c69c38
Passing ImGuiID by copy (32-bits)
2015-03-14 23:44:32 +00:00
ocornut
93befadc0b
Slider code tweaks
2015-03-14 23:33:12 +00:00
ocornut
60591dd7c6
Fixed warning and split bit of SliderFloat() into a private ParseFormat() function
2015-03-14 10:30:07 +00:00
ocornut
72855becab
Slider code syntax tweaks
2015-03-14 09:36:15 +00:00
ocornut
eff466d77d
Fixed parsing of decimal precision back from format string when using %%
2015-03-13 13:38:58 +00:00
ocornut
110d96034b
SliderFloat() fast-path when power=1.0f (no powf() calls) also makes code easier to read
2015-03-13 13:28:30 +00:00
ocornut
aaca73de15
Refactor SliderFloat() internals into a helper SliderFloatAsInputText() + some comments
2015-03-13 13:23:03 +00:00
ocornut
4d78c5c9ab
Comments and reduced ImGuiTextEditState.InitialText[] to 3 KB (assuming average use case of UTF-8 uses 3 bytes charracters)
2015-03-13 13:15:01 +00:00
ocornut
ceb4da2038
Comments
2015-03-13 13:04:10 +00:00
ocornut
55093ea8fe
Separator() logs itself as text
2015-03-13 12:44:04 +00:00
ocornut
153454a0fb
Example console keeps focus on input box at all times
2015-03-13 12:28:23 +00:00
ocornut
1c1a55f6b1
Added IsRootWindowFocused(), IsRootWindowOrAnyChildFocused(). Renamed GetWindowIsFocused() to IsWindowFocused()
2015-03-13 12:25:43 +00:00
ocornut
e2734d23ef
Child window don't take focus when they first appear (focus left to parent)
2015-03-13 11:16:11 +00:00
ocornut
0911526424
Added io.KeyAlt + support in examples apps
...
Currently unused but supported by sample so that more people will have
it set up when menus needs them
2015-03-13 09:49:38 +00:00
ocornut
58dc3f97c5
WIP marker in uppercase.. ( #127 )
2015-03-11 16:45:58 +00:00
ocornut
5d1c381509
Update version number, added IMGUI_VERSION, ImGui::GetVersion() ( #127 )
2015-03-11 16:44:54 +00:00
ocornut
4b1a18c2c9
Fixed more warnings from @bkaradzic
2015-03-09 18:36:03 +00:00
ocornut
dac9266f6f
Fixed warnings
2015-03-09 18:26:48 +00:00
ocornut
378eee490b
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
2015-03-09 18:06:39 +00:00
ocornut
d440a13b7e
Version number
2015-03-09 17:30:22 +00:00
ocornut
91b4b8a0fc
InputText() handles buffer limit correctly for multi-byte UTF-8 characters ( fix #158 )
...
We now maintain the buffer len for both UTF-8 and wchar
2015-03-08 20:21:19 +00:00
ocornut
6cd3ed58ce
Fixed UTF-8 decoding errors leading into infnite loops ( #158 )
2015-03-08 17:55:56 +00:00
ocornut
0eeb6228b9
Default clipboard handlers for Windows handle UTF-8 (the glfw ones already did that)
2015-03-08 17:23:24 +00:00
ocornut
6e12d31417
Scrollbar: moved from Begin() into its own Scrollbar() function + tidying up
2015-03-08 16:37:03 +00:00
ocornut
f021080851
Scrollbar: Clicking inside the grab box doesn't modify scroll. Subsequent movement always relative. ( #150 ).
...
Big change, rather thoroughly tested but hope I didn't break something.
2015-03-08 16:24:11 +00:00
ocornut
32312e538e
Renamed style.ScrollBarWidth to style.ScrollbarWidth to be consistent with other casing.
2015-03-08 15:03:55 +00:00
ocornut
afc23a5617
Tidying up & Chinese glyph range includes missing punctuation.
2015-03-08 13:28:44 +00:00
ocornut
79ddddd910
Merge branch 'master' of https://github.com/ocornut/imgui
2015-03-08 13:26:14 +00:00
Usagi Ito
c9bfd71e1a
Fix the Japanese glyph range; include Punctuations
...
ref. #156 https://github.com/ocornut/imgui/issues/156
2015-03-08 22:23:52 +09:00
ocornut
a579d6f521
Scrollbar tidying up variable names
2015-03-08 12:39:50 +00:00
ocornut
d251204564
ShowTestWindow: fixed "undo" button of custom rendering applet + default size
2015-03-08 12:09:57 +00:00
ocornut
2af8e0238c
Added GetScrollPosY(), GetScrollMaxY() (mentioned in #150 )
2015-03-08 12:04:38 +00:00
ocornut
a5daea9408
Added style.GrabSizeMin
2015-03-08 11:43:57 +00:00
ocornut
849c72c5c3
Forward declare struct in imgui.cpp. Removed two forward declarations leaking in imgui.h
2015-03-08 11:32:39 +00:00
ocornut
ede45389f4
Scrollbar grab have a minimum size (mentioned in #150 )
2015-03-08 11:24:02 +00:00
ocornut
e843539aab
ShowTestWindow: example apps showing even if main window is collaposed.
2015-03-08 10:38:13 +00:00
ocornut
92c35e2772
Rename ImCrc32() -> ImHash()
2015-03-07 23:53:03 +00:00
ocornut
a691a245b7
GetID() doesn't need to account for empty IDStack
2015-03-07 23:52:26 +00:00
ocornut
62c900606d
Fixed .ini saving for windows using ### marker. FindWindowSettings() uses ID compares ( #107 )
2015-03-07 23:35:36 +00:00
ocornut
f9473b807b
Fixed comments
2015-03-07 22:49:16 +00:00
ocornut
3c225bbf88
Fixed typo in comments
2015-03-07 22:24:45 +00:00
ocornut
45a35c24c8
ShowTestWindow(): Added "Manipulating Window Title" example.
2015-03-07 22:20:34 +00:00
ocornut
a8c58c7a35
Minor tweaks.
2015-03-07 22:01:06 +00:00
ocornut
fbbde3a7c0
Updated documentation, better FAQ on ids and usage of "##" and "###" ( #107 )
2015-03-07 21:54:46 +00:00
ocornut
81a742bf54
Added "###" syntax to specify label that isn't part of the hashed ID ( #107 )
2015-03-07 21:53:33 +00:00
ocornut
3cac434737
Minor FindTextDisplayEnd() optimisation
2015-03-07 19:36:18 +00:00
ocornut
e01500f046
Added comments on columns function; Added GetColumnIndex(), GetColumnsCount(), #154
2015-03-07 12:18:01 +00:00
ocornut
6db6c0c8c0
Collapse triangle uses text color (not border color)
2015-03-07 00:35:47 +00:00
ocornut
8dd3f854fe
AA branch: fixed columns separators.
2015-03-07 00:32:52 +00:00
ocornut
470a8499fe
AA branch: fixed input cursor.
2015-03-07 00:28:10 +00:00
ocornut
af1f41dc6a
AA branch: disabled border shadow by default.
2015-03-07 00:26:53 +00:00
ocornut
f5c2f8c60d
AA branch: fixed separators, borders, input cursor. - not really sure about this.
2015-03-07 00:24:21 +00:00
ocornut
cf1554ebb5
AA branch: fixed frame rounding clamping glitch.
2015-03-07 00:06:48 +00:00
