omar
|
111ea7af77
|
Misc comments, todos + reintroduced removed ImGuiCol defines under !IMGUI_DISABLE_OBSOLETE_FUNCTIONS wrap.
|
2018-03-12 17:24:15 +01:00 |
|
omar
|
1f6ad7a894
|
ImFont: Added FindGlyphNoFallback. Fixed MergeMode broken by 1ef1acbd8d
|
2018-03-10 10:33:12 +01:00 |
|
omar
|
945f4d1ecd
|
Removed redundant semi colons. (#1653)
|
2018-03-05 16:16:27 +01:00 |
|
omar
|
69e700f869
|
Renamed ImGuiStyleVar_Count_ to ImGuiStyleVar_COUNT for consistency with other enums. Added
|
2018-03-03 20:15:10 +01:00 |
|
omar
|
8a4093f38b
|
Added ArrowButton(). Exposed ImGuiDir.
|
2018-03-03 20:08:03 +01:00 |
|
omar
|
b3594a6407
|
Added ImGuiConfigFlags_IsSRGB, ImGuiConfigFlags_IsTouchScreen (strictly for user storage)
|
2018-02-28 21:16:47 +01:00 |
|
omar
|
2c9f45bbe7
|
Renamed ImGuiNavFlags io.NavFlags to ImGuiConfigFlags io.ConfigFlags. (#787)
|
2018-02-28 18:51:40 +01:00 |
|
omar
|
4ec931853e
|
Demo: Fonts; Added Font Offset.
|
2018-02-13 21:03:30 +01:00 |
|
omar
|
7c16d52f72
|
Updated version to 1.60 WIP to emphasis on the addition of required calls CreateContext/DestroyContext + merged the massive Navigation branch (#1565, #787)
|
2018-02-06 20:20:34 +01:00 |
|
omar
|
5c83b55d04
|
Nav: Added ImGuiWindowFlags_NoNav shortcut, comments. (#787)
|
2018-02-05 15:49:35 +01:00 |
|
omar
|
8ad88f725c
|
Nav: Minor tidying up. (#787)
|
2018-02-05 14:53:22 +01:00 |
|
omar
|
efbd8cebe7
|
Nav: Comments (#787)
|
2018-02-01 22:53:08 +01:00 |
|
omar
|
eaa6f490a2
|
Merge branch 'master' into navigation
# Conflicts:
# imgui_demo.cpp
|
2018-01-31 23:38:05 +01:00 |
|
omar
|
dbdbf01b9f
|
Demo: Tweaked the Child demos, added a menu bar to the second child to test some navigation functions.
|
2018-01-31 23:35:54 +01:00 |
|
omar
|
38d45ee73f
|
Demo: Tweaked the Child demos, added a menu bar to the second child to test some navigation functions.
|
2018-01-31 19:13:20 +01:00 |
|
omar
|
47e81a6194
|
Merge branch 'master' into navigation
|
2018-01-31 16:00:25 +01:00 |
|
omar
|
cd3dd886de
|
Moved extra_fonts/ to misc/fonts/. Moved .natvis file to misc/natvis/ (#1569)
|
2018-01-31 16:00:07 +01:00 |
|
omar
|
23c11e9764
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
|
2018-01-31 15:43:19 +01:00 |
|
omar
|
cca9c3e3da
|
Examples: Using Dark theme by default. (#707). Tweaked demo code.
|
2018-01-31 00:15:47 +01:00 |
|
omar
|
bebe03db05
|
Metrics: Minor formatting tweaks
|
2018-01-30 21:17:27 +01:00 |
|
omar
|
bd579e5429
|
Nav: Removed io.NavUsable --> io.NavActive, io.NavActive --> io.NavVisible. (#787). NavActive takes account of NavFlags enable flags.
|
2018-01-30 20:07:12 +01:00 |
|
omar
|
c851b33352
|
Nav: Added proper version of ImGuiWindowFlags_NavFlattened that handles scrolling nicely. Marked as private as I'm not happy with the name. (#787)
|
2018-01-29 23:59:46 +01:00 |
|
omar
|
6f366fff6b
|
Demo: Tweaked example menu with colors + menu items, was currently particularly inconvenient for Nav. Will rework later. (#787)
|
2018-01-24 17:41:47 +01:00 |
|
omar
|
455989b8b1
|
Nav: Added io.NavFlags to hold various options. Added ImGuiNavFlags_EnableGamepad and ImGuiNavFlags_EnableKeyboard for bindings to use (#787)
|
2018-01-24 17:41:47 +01:00 |
|
omar
|
d500113f1d
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
|
2018-01-23 19:16:43 +01:00 |
|
omar
|
9a76fd30fd
|
Added SetNextWindowBgAlpha() helper. (#1567) particularly helpul with the marking of the old 5-parameters version of Begin() as obsolete.
|
2018-01-23 19:13:49 +01:00 |
|
omar
|
1493de4f81
|
Internals: Merge of harmless stuff from Navigation stuff. Added GetHoveredID() internal helper.
|
2018-01-12 19:53:27 +01:00 |
|
omar
|
c85d7d6e49
|
Nav: Remove GetItemID(), hide ActivateItem() before this feature is unfinished and has issue (full feature is on hold). Undo part of 59c6f35bf6 (#787)
|
2018-01-12 19:28:37 +01:00 |
|
omar
|
cd7e178eac
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
|
2018-01-11 16:49:59 +01:00 |
|
omar
|
a8bbb0b7dd
|
Demo: Using IM_COL32() instead of ImColor() in ImDrawList centric contexts.
|
2018-01-11 15:47:07 +01:00 |
|
omar
|
12aa3cb09e
|
Demo: Tweaks format.
|
2018-01-11 15:22:33 +01:00 |
|
omar
|
a63fbbca8b
|
Added ImGuiHoveredFlags_AnyWindow, ImGuiFocusedFlags_AnyWindow. Obsoleted IsAnyWindowHovered()/IsAnyWindowFocused() in favor of IsWindowHovered(ImGuiHoveredFlags_AnyWindow)/IsWindowFocused(ImGuiFocusedFlags_AnyWindow). Added to demo. (#1382)
|
2018-01-11 13:51:18 +01:00 |
|
omar
|
2b8224692e
|
Merge branch 'master' into navigation
|
2018-01-03 20:26:24 +01:00 |
|
omar
|
a7deb3a394
|
Demo: Minor tweaks.
|
2018-01-03 15:36:51 +01:00 |
|
omar
|
9fbecac87e
|
Demo: Improved Selectable() examples. (#1528)
|
2018-01-03 15:11:14 +01:00 |
|
omar
|
05ec0b0736
|
Casing tweaks + clarify license copyright (simpler/safer?) (#1346)
|
2018-01-03 14:32:16 +01:00 |
|
omar
|
96ccc484f9
|
Merge branch 'master' into navigation
# Conflicts:
# imgui_internal.h
|
2018-01-03 12:33:27 +01:00 |
|
omar
|
3c6fbe0849
|
Renamed ImGuiSizeConstraintCallback to ImGuiSizeCallback, ImGuiSizeConstraintCallbackData to ImGuiSizeCallbackData.
|
2018-01-03 12:31:56 +01:00 |
|
omar
|
7a15fc8de5
|
Merge branch 'master' into navigation
|
2017-12-29 18:28:23 +01:00 |
|
omar
|
2dd2ca0096
|
Removed CalcItemRectClosestPoint() which was weird and not really used by anyone except demo code. If you need it it's easy to replicate on your side.
Removed internal corresponding ImRect::GetClosestPoint() for now.
Essentially revert dcaafffe0e.
|
2017-12-29 17:59:13 +01:00 |
|
omar
|
c4e6d622c1
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
# imgui.h
|
2017-12-29 13:39:07 +01:00 |
|
omar
|
4ba2e85744
|
Demo: Tweak. Comments. Metrics: Added some Drag and Drop info.
|
2017-12-28 23:53:27 +01:00 |
|
omar
|
49eed6e2d1
|
Version 1.54 WIP
|
2017-12-28 15:17:35 +01:00 |
|
omar
|
436cad4bca
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.h
|
2017-12-26 15:37:31 +01:00 |
|
omar
|
9511f22e8b
|
Demo: Console: More friendly to text color changes.
|
2017-12-25 18:47:44 +01:00 |
|
omar
|
e916310b2e
|
Version 1.53
|
2017-12-25 17:41:41 +01:00 |
|
omar
|
3d48f5b8c2
|
Demo: BeginCombo() demo code
|
2017-12-25 17:41:02 +01:00 |
|
omar
|
de5c304b49
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
|
2017-12-24 18:59:40 +01:00 |
|
omar
|
8d54b1b7af
|
Misc comments, removed duplicated IM_ARRAYSIZE macro in imgui_demo.cpp (it is now declared in imgui.h)
|
2017-12-24 18:59:14 +01:00 |
|
omar
|
1b86e7343f
|
Renamed the emblematic ShowTestWindow() function to ShowDemoWindow(). Kept redirection function (will obsolete).
|
2017-12-24 18:16:22 +01:00 |
|