111ea7af77
Misc comments, todos + reintroduced removed ImGuiCol defines under !IMGUI_DISABLE_OBSOLETE_FUNCTIONS wrap.
7 years ago
1f6ad7a894
ImFont: Added FindGlyphNoFallback. Fixed MergeMode broken by 1ef1acbd8d
7 years ago
945f4d1ecd
Removed redundant semi colons. ( #1653 )
7 years ago
69e700f869
Renamed ImGuiStyleVar_Count_ to ImGuiStyleVar_COUNT for consistency with other enums. Added
7 years ago
8a4093f38b
Added ArrowButton(). Exposed ImGuiDir.
7 years ago
b3594a6407
Added ImGuiConfigFlags_IsSRGB, ImGuiConfigFlags_IsTouchScreen (strictly for user storage)
7 years ago
2c9f45bbe7
Renamed ImGuiNavFlags io.NavFlags to ImGuiConfigFlags io.ConfigFlags. ( #787 )
7 years ago
4ec931853e
Demo: Fonts; Added Font Offset.
7 years ago
7c16d52f72
Updated version to 1.60 WIP to emphasis on the addition of required calls CreateContext/DestroyContext + merged the massive Navigation branch ( #1565 , #787 )
7 years ago
5c83b55d04
Nav: Added ImGuiWindowFlags_NoNav shortcut, comments. ( #787 )
7 years ago
8ad88f725c
Nav: Minor tidying up. ( #787 )
7 years ago
efbd8cebe7
Nav: Comments ( #787 )
7 years ago
eaa6f490a2
Merge branch 'master' into navigation
...
# Conflicts:
# imgui_demo.cpp
7 years ago
dbdbf01b9f
Demo: Tweaked the Child demos, added a menu bar to the second child to test some navigation functions.
7 years ago
38d45ee73f
Demo: Tweaked the Child demos, added a menu bar to the second child to test some navigation functions.
7 years ago
47e81a6194
Merge branch 'master' into navigation
7 years ago
cd3dd886de
Moved extra_fonts/ to misc/fonts/. Moved .natvis file to misc/natvis/ ( #1569 )
7 years ago
23c11e9764
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
7 years ago
cca9c3e3da
Examples: Using Dark theme by default. ( #707 ). Tweaked demo code.
7 years ago
bebe03db05
Metrics: Minor formatting tweaks
7 years ago
bd579e5429
Nav: Removed io.NavUsable --> io.NavActive, io.NavActive --> io.NavVisible. ( #787 ). NavActive takes account of NavFlags enable flags.
7 years ago
c851b33352
Nav: Added proper version of ImGuiWindowFlags_NavFlattened that handles scrolling nicely. Marked as private as I'm not happy with the name. ( #787 )
7 years ago
6f366fff6b
Demo: Tweaked example menu with colors + menu items, was currently particularly inconvenient for Nav. Will rework later. ( #787 )
7 years ago
455989b8b1
Nav: Added io.NavFlags to hold various options. Added ImGuiNavFlags_EnableGamepad and ImGuiNavFlags_EnableKeyboard for bindings to use ( #787 )
7 years ago
d500113f1d
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
7 years ago
9a76fd30fd
Added SetNextWindowBgAlpha() helper. ( #1567 ) particularly helpul with the marking of the old 5-parameters version of Begin() as obsolete.
7 years ago
1493de4f81
Internals: Merge of harmless stuff from Navigation stuff. Added GetHoveredID() internal helper.
7 years ago
c85d7d6e49
Nav: Remove GetItemID(), hide ActivateItem() before this feature is unfinished and has issue (full feature is on hold). Undo part of 59c6f35bf6 ( #787 )
7 years ago
cd7e178eac
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
7 years ago
a8bbb0b7dd
Demo: Using IM_COL32() instead of ImColor() in ImDrawList centric contexts.
7 years ago
12aa3cb09e
Demo: Tweaks format.
7 years ago
a63fbbca8b
Added ImGuiHoveredFlags_AnyWindow, ImGuiFocusedFlags_AnyWindow. Obsoleted IsAnyWindowHovered()/IsAnyWindowFocused() in favor of IsWindowHovered(ImGuiHoveredFlags_AnyWindow)/IsWindowFocused(ImGuiFocusedFlags_AnyWindow). Added to demo. ( #1382 )
7 years ago
2b8224692e
Merge branch 'master' into navigation
7 years ago
a7deb3a394
Demo: Minor tweaks.
7 years ago
9fbecac87e
Demo: Improved Selectable() examples. ( #1528 )
7 years ago
05ec0b0736
Casing tweaks + clarify license copyright (simpler/safer?) ( #1346 )
7 years ago
96ccc484f9
Merge branch 'master' into navigation
...
# Conflicts:
# imgui_internal.h
7 years ago
3c6fbe0849
Renamed ImGuiSizeConstraintCallback to ImGuiSizeCallback, ImGuiSizeConstraintCallbackData to ImGuiSizeCallbackData.
7 years ago
7a15fc8de5
Merge branch 'master' into navigation
7 years ago
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
7 years ago
c4e6d622c1
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
7 years ago
4ba2e85744
Demo: Tweak. Comments. Metrics: Added some Drag and Drop info.
7 years ago
49eed6e2d1
Version 1.54 WIP
7 years ago
436cad4bca
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.h
7 years ago
9511f22e8b
Demo: Console: More friendly to text color changes.
7 years ago
e916310b2e
Version 1.53
7 years ago
3d48f5b8c2
Demo: BeginCombo() demo code
7 years ago
de5c304b49
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
7 years ago
8d54b1b7af
Misc comments, removed duplicated IM_ARRAYSIZE macro in imgui_demo.cpp (it is now declared in imgui.h)
7 years ago
1b86e7343f
Renamed the emblematic ShowTestWindow() function to ShowDemoWindow(). Kept redirection function (will obsolete).
7 years ago
cead207535
Comments
7 years ago
ffb4f6ca8c
Merge branch 'master' into navigation
7 years ago
983d8f5f8e
Various zealous warning fixes (Clang).
7 years ago
1c1e490316
Merge branch 'master' into navigation
7 years ago
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 )
7 years ago
287380261c
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
7 years ago
996dfb21cf
ImDrawList: Added ImDrawListFlags for AA settings. ImDrawList doesn't directly depends on GImGui anymore.
7 years ago
6497f5dc1b
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.h
7 years ago
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 )
7 years ago
fa68cb5364
Demo: Console: Tweak.
7 years ago
cc3192f347
Merge branch 'master' into navigation
...
# Conflicts:
# imgui_internal.h
7 years ago
3905816082
Added ShowFontSelector(), ShowStyleSelector(). ( #707 )
7 years ago
fa9327ccf8
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_draw.cpp
# imgui_internal.h
7 years ago
d0a1be0de0
Merge branch 'drag_and_drop'
7 years ago
ef1a683ebe
Removed use of obsolete ImGui API.
7 years ago
052b6021dd
Merge branch 'master' into drag_and_drop
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_internal.h
7 years ago
0a3db267c3
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_demo.cpp
# imgui_internal.h
7 years ago
6190ab0084
Renamed GetItemsLineHeightWithSpacing() to GetFrameHeightWithSpacing()
7 years ago
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).
7 years ago
8d8f4934fb
Demo: mouse dragging demo tweaks
7 years ago
4a555d35f0
IsWindowHovered(): split ImGuiHoveredFlags_FlattenChild into separate ChildWindows and RootWindow flags. Allowing more combination and a better symetry with IsWindowFocused() flags. ( #1382 )
7 years ago
2b9d8ab91d
Merge branch 'master' into drag_and_drop
...
# Conflicts:
# imgui.cpp
# imgui.h
7 years ago
38bfdb357e
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
7 years ago
e67f3809ed
Replaced obsolete function with new one.
7 years ago
d1db229907
Merge branch 'master' into navigation
...
# Conflicts:
# imgui_demo.cpp
7 years ago
71296910a0
Demo: Tweaks and spacing. Stopped using rand() function in demo code.
7 years ago
4b8857d536
Demo: About box tweaks.
7 years ago
20ba79aa56
Demo: Added "No close" option.
7 years ago
871a5cecc1
Merge branch 'master' into navigation
7 years ago
c9f0275e22
Combo: Removed ImGuiWindowFlags_ComboBox flag. Moved internal window flags.
7 years ago
a4863e8084
Demo: Picker with palette demo supports drag and drop. ( #143 , #346 )
7 years ago
e6215b6ca0
Merge branch 'master' into navigation + merge fix
...
# Conflicts:
# imgui.cpp
7 years ago
abe5ad3c7a
Demo: Added display for IsMouseDragging() function.
7 years ago
94bf12f14b
Demo: Display better mouse cursor info for debugging backends.
7 years ago
81cbaef806
Merge branch 'master' into navigation
7 years ago
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)
7 years ago
a20fe279c5
Demo: Layout: Removed unnecessary BeginChild/EndChild calls
7 years ago
9191b17218
Merge branch 'master' into navigation
7 years ago
532f564fd3
ImGuiTextBuffer: Renamed append() helper to appendf(), appendv() to appendfv(). Added reserve().
7 years ago
2543807e56
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
7 years ago
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).
7 years ago
3c5e64db78
Demo: Tweaked Image() code.
7 years ago
9848a7023b
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
7 years ago
28a31997b7
Style Editor: Simplified settings also show PopupBorderSize as a checkbox. ( #707 , #1019 )
7 years ago
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 )
7 years ago
4cdd998be8
Demo: Fix warning "format not a string literal and no format arguments" for over-zealous compilers settings. ( #1450 , #1451 )
7 years ago
d211a0e338
Merge branch 'master' into navigation (with style breakable)
...
# Conflicts:
# imgui.cpp
# imgui_draw.cpp
7 years ago
d7af1a218e
Style: Added PopupRounding setting. ( #1112 )
7 years ago
0a61b7195c
Style: Added a default StyleColorsLight(). ( #707 )
7 years ago
e7e81b265d
Demo: Tweaks.
7 years ago
omar
Branimir Karadžić