Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2024-12-24 16:46:36 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,456 Commits 13 Branches 79 Tags 86 MiB
a1ec7723ef
Commit Graph

467 Commits

Author SHA1 Message Date
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
omar
cead207535 Comments 2017-12-24 17:58:41 +01:00
omar
ffb4f6ca8c Merge branch 'master' into navigation 2017-12-23 16:27:48 +01:00
omar
983d8f5f8e Various zealous warning fixes (Clang). 2017-12-23 15:28:49 +01:00
omar
1c1e490316 Merge branch 'master' into navigation 2017-12-22 20:21:54 +01:00
omar
e1a103b251 Drag and Drop: Disable tracking mouse button ownership when an external drag source is active, to make it easier to achieve drag and drop over multiple OS windows. (#143) 2017-12-22 20:20:52 +01:00
omar
287380261c Merge branch 'master' into navigation 
# Conflicts:
#	imgui.cpp
 2017-12-21 19:55:21 +01:00
omar
996dfb21cf ImDrawList: Added ImDrawListFlags for AA settings. ImDrawList doesn't directly depends on GImGui anymore. 2017-12-21 19:49:54 +01:00
omar
6497f5dc1b Merge branch 'master' into navigation 
# Conflicts:
#	imgui.h
 2017-12-15 11:59:50 +01:00
omar
eefea0588a Using the ImGuiWindowFlags_NoScrollWithMouse flag on a child window forwards the mouse wheel event to the parent window, unless either ImGuiWindowFlags_NoInputs or ImGuiWindowFlags_NoScrollbar are also set. (#1380, #1502) 2017-12-14 18:42:41 +01:00
omar
fa68cb5364 Demo: Console: Tweak. 2017-12-13 23:07:07 +01:00
omar
cc3192f347 Merge branch 'master' into navigation 
# Conflicts:
#	imgui_internal.h
 2017-12-13 22:09:08 +01:00
omar
3905816082 Added ShowFontSelector(), ShowStyleSelector(). (#707) 2017-12-13 21:59:16 +01:00
omar
fa9327ccf8 Merge branch 'master' into navigation 
# Conflicts:
#	imgui.cpp
#	imgui.h
#	imgui_draw.cpp
#	imgui_internal.h
 2017-12-12 20:44:12 +01:00
omar
d0a1be0de0 Merge branch 'drag_and_drop' 2017-12-12 20:39:52 +01:00
Branimir Karadžić
ef1a683ebe Removed use of obsolete ImGui API. 2017-12-12 17:59:09 +01:00
omar
052b6021dd Merge branch 'master' into drag_and_drop 
# Conflicts:
#	imgui.cpp
#	imgui.h
#	imgui_internal.h
 2017-12-12 15:02:05 +01:00
omar
0a3db267c3 Merge branch 'master' into navigation 
# Conflicts:
#	imgui.cpp
#	imgui.h
#	imgui_demo.cpp
#	imgui_internal.h
 2017-12-12 14:58:53 +01:00
omar
6190ab0084 Renamed GetItemsLineHeightWithSpacing() to GetFrameHeightWithSpacing() 2017-12-12 14:14:58 +01:00
omar
08b72eb5c0 IsWindowFocused() refactor will flags. (#1382) 
Marked IsRootWindowFocused() as obsolete in favor of using IsWindowFocused(ImGuiFocusedFlags_RootWindow).
Marked IsRootWindowOrAnyChildFocused() as obsolete in favor of using IsWindowFocused(ImGuiFocusedFlags_RootAndChildWindows).
 2017-12-12 14:07:12 +01:00
omar
8d8f4934fb Demo: mouse dragging demo tweaks 2017-12-12 13:11:40 +01:00
omar
4a555d35f0 IsWindowHovered(): split ImGuiHoveredFlags_FlattenChild into separate ChildWindows and RootWindow flags. Allowing more combination and a better symetry with IsWindowFocused() flags. (#1382) 2017-12-12 12:50:42 +01:00
omar
2b9d8ab91d Merge branch 'master' into drag_and_drop 
# Conflicts:
#	imgui.cpp
#	imgui.h
 2017-12-11 16:39:27 +01:00
omar
38bfdb357e Merge branch 'master' into navigation 
# Conflicts:
#	imgui.cpp
#	imgui.h
 2017-12-11 16:28:47 +01:00
Branimir Karadžić
e67f3809ed Replaced obsolete function with new one. 2017-12-11 09:57:05 +01:00
omar
d1db229907 Merge branch 'master' into navigation 
# Conflicts:
#	imgui_demo.cpp
 2017-12-10 19:01:59 +01:00
omar
71296910a0 Demo: Tweaks and spacing. Stopped using rand() function in demo code. 2017-12-10 18:49:47 +01:00
omar
4b8857d536 Demo: About box tweaks. 2017-12-10 18:45:05 +01:00
omar
20ba79aa56 Demo: Added "No close" option. 2017-12-10 17:02:41 +01:00
omar
871a5cecc1 Merge branch 'master' into navigation 2017-12-08 18:32:46 +01:00
omar
c9f0275e22 Combo: Removed ImGuiWindowFlags_ComboBox flag. Moved internal window flags. 2017-12-08 18:32:12 +01:00
omar
a4863e8084 Demo: Picker with palette demo supports drag and drop. (#143, #346) 2017-12-08 12:49:35 +01:00
omar
e6215b6ca0 Merge branch 'master' into navigation + merge fix 
# Conflicts:
#	imgui.cpp
 2017-12-07 16:42:52 +01:00
omar
abe5ad3c7a Demo: Added display for IsMouseDragging() function. 2017-12-07 13:27:55 +01:00
omar
94bf12f14b Demo: Display better mouse cursor info for debugging backends. 2017-12-07 13:27:49 +01:00
omar
81cbaef806 Merge branch 'master' into navigation 2017-11-29 23:49:17 +01:00
omar
0d53c8d480 Demo: Console: Fixed incorrect positioning which was hidden by a minor scroll issue (this would affect people who copied the console code as is) 2017-11-29 23:48:32 +01:00
omar
a20fe279c5 Demo: Layout: Removed unnecessary BeginChild/EndChild calls 2017-11-29 23:48:32 +01:00
omar
9191b17218 Merge branch 'master' into navigation 2017-11-28 17:28:08 +01:00
omar
532f564fd3 ImGuiTextBuffer: Renamed append() helper to appendf(), appendv() to appendfv(). Added reserve(). 2017-11-27 19:02:00 +01:00
omar
2543807e56 Merge branch 'master' into navigation 
# Conflicts:
#	imgui.cpp
#	imgui_internal.h
 2017-11-20 13:54:06 +01:00
omar
3f5b2a3fe3 Exposed ImDrawCornerFlags, replaced occurences of ~0 with an explicit ImDrawCornerFlags_All. Inversed BotLeft (prev 1<<3, now 1<<2) and BotRight (prev 1<<2, now 1<<3). 2017-11-20 13:53:16 +01:00
omar
3c5e64db78 Demo: Tweaked Image() code. 2017-11-20 13:30:25 +01:00
omar
9848a7023b Merge branch 'master' into navigation 
# Conflicts:
#	imgui.cpp
#	imgui_demo.cpp
 2017-11-19 16:21:21 +01:00
omar
28a31997b7 Style Editor: Simplified settings also show PopupBorderSize as a checkbox. (#707, #1019) 2017-11-19 16:03:42 +01:00
omar
abbf836fd0 Style, Begin: removed ImGuiWindowFlags_ShowBorders window flag. Borders are now fully set up in the ImGuiStyle structure (see e.g. style.FrameBorderSize, style.WindowBorderSize). Use ImGui::ShowStyleEditor() to look them up. (#707, fix #819, #1031, ref #1019, ref #447) 2017-11-19 15:56:51 +01:00
omar
4cdd998be8 Demo: Fix warning "format not a string literal and no format arguments" for over-zealous compilers settings. (#1450, #1451) 2017-11-19 00:49:23 +01:00
omar
d211a0e338 Merge branch 'master' into navigation (with style breakable) 
# Conflicts:
#	imgui.cpp
#	imgui_draw.cpp
 2017-11-19 00:39:37 +01:00
omar
d7af1a218e Style: Added PopupRounding setting. (#1112) 2017-11-19 00:29:29 +01:00
omar
0a61b7195c Style: Added a default StyleColorsLight(). (#707) 2017-11-19 00:29:29 +01:00
omar
e7e81b265d Demo: Tweaks. 2017-11-18 23:44:16 +01:00
omar
1c41603b31 Style Editor: Using local storage so Save/Revert button made some more sense without code passing its storage. Tweaked layout, added horizontal scroll bar, Fixed Save/Revert button to be always accessible. (fix #1211) 2017-11-18 23:44:16 +01:00
omar
c1b5eab868 Style Editor: Sneakily adding a combo box to change colors (#707) 2017-11-18 23:18:18 +01:00
omar
bd4bc929ce Style: renamed style.ChildWindowRounding to style.ChildRounding, ImGuiStyleVar_ChildWindowRounding to ImGuiStyleVar_ChildRounding. 2017-11-18 18:28:21 +01:00
omar
6817f3a3d9 Merge branch 'master' into navigation 2017-11-15 23:44:50 +01:00
omar
27fd1b913b Made it guaranteed by API that after calling Begin() the last Item represent the title bar. (#823) 2017-11-15 14:35:45 +01:00