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 |
|
ocornut
|
9733f4fa24
|
Internal RenderBullet() helper.
|
2016-05-01 20:19:28 +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
|
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
|
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
|
c5149cd53c
|
MenuItem(): checkmark render in disabled color when disabled
|
2016-04-27 23:34:24 +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
|
41215534d5
|
Internal ImRound() -> ImFloor(), ImRect::Round() -> ImRect::Floor(),
|
2016-04-23 14:10:36 +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
|
ab4a69bcd4
|
Comments
|
2016-04-19 18:31:40 +02:00 |
|
ocornut
|
fc3b8d0a56
|
Relative order of Child windows creation is preserved during sort (#595)
|
2016-04-19 18:31:25 +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
|
4c1d4233b2
|
Merge branch 'master' into 2016-02-colorpicker
|
2016-04-03 01:10:26 +02:00 |
|
ocornut
|
d53c308852
|
Moved EndFrame() back to imgui_internal.h + comments. Undo cfbf06e394
|
2016-04-03 00:47:41 +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
|
baabe3b62c
|
Merge branch 'master' into 2016-02-colorpicker
|
2016-03-23 10:50:37 +01:00 |
|
ocornut
|
928832a5bc
|
Various tidying up / comments, moved columns functions declarations, no functional changes
|
2016-03-21 22:11:43 +01:00 |
|
Kyle Rocha
|
b8fcb4e7e4
|
Converted tabs to spaces
|
2016-03-21 12:40:02 -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 |
|
ocornut
|
459af7683c
|
Merge branch 'master' into 2016-02-colorpicker
|
2016-03-04 13:57:33 +01:00 |
|
ocornut
|
2065cbec4d
|
Removed extraneous comma for pedantic compilers (#516)
|
2016-03-03 00:34:06 +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
|
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
|
339b67c01a
|
Exposed FindWindowByName() in imgui_internal.h
|
2016-02-20 17:37:36 +01:00 |
|
ocornut
|
b329a36d27
|
Moved declaration of SetItemAllowOverlap() to imgui.h (ref #517)
|
2016-02-02 19:52:30 +01:00 |
|