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
|
30d1e5712a
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_internal.h
|
2017-08-08 17:30:32 +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
|
03700ad15e
|
Merge remote-tracking branch 'origin' into 2016-07-navigation
|
2017-08-07 22:51:18 +08:00 |
|
omar
|
fb54dce71c
|
Internals: Added ImLineClosestPoint, ImTriangleClosestPoint helpers. Changing ImVec2 arg to const ImVec2&
|
2017-07-31 21:11:41 +08:00 |
|
omar
|
1a26d0bc98
|
Internals: Added ImDot(), ImRotate(), ImLerp(v2,v2,float) helpers.
|
2017-07-31 18:56:51 +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
|
390188dfa9
|
Comments about parts of imgui_internal.h that will self-destruct.
|
2017-07-30 16:16:06 +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
|
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
|
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
|
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
|
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
|
78a8f798c5
|
ColorEdit, ColorPicker, ColorButton: Display grid under transparent colors (WIP) (#346)
|
2017-07-26 15:24:09 +08:00 |
|
omar
|
a8b202782f
|
ColorPicker,ColorButton: Honor Border/Shadow style settings (#346)
|
2017-07-22 19:37:13 +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
|
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
|
85d9c8fb46
|
Internals: renaming IndexWithinParent to OrderWithinParent
|
2017-07-20 21:25:31 +08:00 |
|
omar
|
3e4cb40d45
|
Merge branch 'master' into 2016-02-colorpicker
|
2017-07-19 14:53:25 +08: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
|
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 |
|
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
|
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
|
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
|
1a0e414d3a
|
Fixed uninitialized variables (wouldn't have a real effect because they'd be cleared in Begin()).
|
2016-11-12 21:17:30 +01: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
|
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
|
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
|
404979e48d
|
Merge remote-tracking branch 'origin' into 2016-02-colorpicker
|
2016-10-07 09:52:00 +02:00 |
|
ocornut
|
fea0fcb7c3
|
Merge remote-tracking branch 'origin' into 2016-07-navigation
|
2016-09-25 15:25:55 +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
|
c5b8c6303a
|
Refactor PushStyleVar/PopStyleVar so it is constant time + can receive integers (yet unused) (#842)
|
2016-09-25 11:06:14 +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
|
ac7826c8a5
|
ImRect: Added Translate() helper, removed redundant and misleading Reduce()
|
2016-08-21 14:37:48 +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
|
695ca7bb45
|
Nav: Tidying up. Comments. (#323)
|
2016-08-20 23:27:25 +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
|
996eb080fa
|
Merge remote-tracking branch 'origin' into 2016-02-colorpicker
|
2016-08-11 22:53:26 +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
|
cbf24c13ca
|
Merge remote-tracking branch 'origin' into 2016-07-navigation
|
2016-08-07 12:15:21 +02:00 |
|
ocornut
|
a7f6ea592f
|
Moved GetColorU32 out of imgui_internal.h to avoid inlining mess (#759)
|
2016-08-06 09:22:41 +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
|
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
|
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
|
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
|
e2dd48ae65
|
Nav: Split _NoNav window flag into _NoNavInputs and _NoNavFocus (#323)
|
2016-07-30 18:06:05 +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
|
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
|
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
|
20a0fde012
|
Tidying up default clipboard handler for non Windows-OS
|
2016-07-30 10:02:46 +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
|
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
|
a424d6f805
|
Navigation: Fixed missing initialization (had no side-effect, would be set in Begin) (#323)
|
2016-07-24 14:08:50 +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
|
c2cb2a6928
|
Gamepad/Keyboard navigation support, initial commit, WIP (#323)
|
2016-07-20 00:02:59 +02:00 |
|
ocornut
|
0300e73b3f
|
Comments
|
2016-07-18 15:26:07 +02:00 |
|
ocornut
|
2df229d002
|
Fixed incorrect comment for ParentWindow (#615, #604)
|
2016-07-18 15:26:06 +02:00 |
|
ocornut
|
91e1c56da6
|
Minor bits.
|
2016-07-18 15:25:59 +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 |
|
ocornut
|
de61fcc619
|
Minor bits
|
2016-06-25 17:03:49 +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
|
d1c073a199
|
Comments, tweaks
|
2016-05-31 00:00:44 +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
|
9a751da136
|
Caving in to ignoring stupid pedantic Clang warnings for old-style-cast in header files
|
2016-05-29 19:14:19 +02:00 |
|
ocornut
|
3ddb50a925
|
Merge branch 'master' into 2016-02-colorpicker
|
2016-05-29 19:07:23 +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
|
b7ebeb1610
|
Added SetNextWindowSizeConstraint() + demo code (#668)
|
2016-05-21 22:53:08 +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
|
b630cb5b42
|
ImGuiWindow: Storing ParentWindow (#615, #646)
|
2016-05-10 17:00:42 +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 |
|
ocornut
|
ce4d731486
|
Minor comments, tweaks
|
2016-05-07 18:10:32 +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
|
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 |
|