omar
3dfac93ebe
Fonts: Fixed debug name not being zero-terminated if longer than storage buffer + made buffer slightly longer as well.
7 years ago
omar
642c6748ac
Comments, Changelog
7 years ago
omar
a1f3949d71
Drag and Drop: Increased payload data type to 32 characters. ( #143 )
7 years ago
omar
0ec356eb6e
Comments, FAQ update.
7 years ago
omar
69e700f869
Renamed ImGuiStyleVar_Count_ to ImGuiStyleVar_COUNT for consistency with other enums. Added
7 years ago
omar
8a4093f38b
Added ArrowButton(). Exposed ImGuiDir.
7 years ago
omar
1549c5cf5e
BeginCombo(): Added ImGuiComboFlags_NoArrowButton and ImGuiComboFlags_NoPreview flags + hover color matches drag and sliders.
7 years ago
omar
df8a9c49eb
Allow user to override ImTextureId. ( #1641 )
7 years ago
omar
6797ee4b68
Nav: Added links to PNG/PSD files for PS4 and Switch. Fixed suggested Joy-con mapping as per typical Nintendo-style mapping. ( #787 )
7 years ago
omar
b3594a6407
Added ImGuiConfigFlags_IsSRGB, ImGuiConfigFlags_IsTouchScreen (strictly for user storage)
7 years ago
omar
2c9f45bbe7
Renamed ImGuiNavFlags io.NavFlags to ImGuiConfigFlags io.ConfigFlags. ( #787 )
7 years ago
omar
27667fc035
TreeNode: Renamed Beta ImGuiTreeNodeFlags_NavCloseFromChild to ImGuiTreeNodeFlags_NavLeftJumpsBackHere. ( #1079 )
7 years ago
omar
79969931e6
ImDrawList: PushTextureID(): Removed unnecessary param by reference.
7 years ago
omar
2c3c5125b3
Drag and Drop: BeginDragDropSource(): temporarily removed the optional mouse_button=0 parameter because it is really usable in typical conditions at the moment. ( #143 , #1637 )
7 years ago
omar
1399c9c8a9
Merged a bunch of small inconsequential things from my work branch, to reduce the diff noise.
7 years ago
omar
7c75835200
Renamed misleading ImGuiMouseCursor_Move to ImGuiMouseCursor_ResizeAll. SDL: Fixed cursor. ( #1626 )
7 years ago
omar
63332d152a
Obsoleted the io.RenderDrawListsFn callback, you can call your graphics engine render function after ImGui::Render(). Use ImGui::GetDrawData() to retrieve the ImDrawData* to display..( #1599 )
...
Examples: Updated examples.
7 years ago
omar
30c469f7c5
ImFont: DisplayOffset.y defaults to 0 instead of +1.
7 years ago
omar
024e23c4d7
Comments, moved ImFontAtlas::Flags to "public" area.
7 years ago
omar
fed0a884f7
ImFontAtlas: Added ImFontAtlasFlags_NoPowerOfTwoHeight, ImFontAtlasFlags_NoMouseCursors flags. ( #1613 )
7 years ago
omar
9263bd68db
Fixed legacy forward function IsRootWindowOrAnyChildHovered() broken by a63fbbca8b
7 years ago
omar
7cc1bc7635
Added IsAnyMouseDown() helper.
...
Examples: DirectX9/10/11: Using IsAnyMouseDown() instead of local function.
7 years ago
omar
88dcbeb7ff
Styles: Comments and re-ordered.
7 years ago
omar
8099f8c270
Comments
7 years ago
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 )
7 years ago
omar
f0364aa359
Merge branch 'context'
...
# Conflicts:
# examples/allegro5_example/main.cpp
# examples/directx10_example/main.cpp
# examples/directx11_example/main.cpp
# examples/directx9_example/main.cpp
# examples/marmalade_example/main.cpp
# examples/opengl2_example/main.cpp
# examples/opengl3_example/main.cpp
# examples/sdl_opengl2_example/main.cpp
# examples/sdl_opengl3_example/main.cpp
# examples/vulkan_example/main.cpp
7 years ago
omar
4e5b7612ae
Nav: Documentation tweaks. ( #787 )
7 years ago
omar
3171f90a1a
Nav: Keyboard is now automatically mapped based on io.KeyDown[]. ( #787 )
7 years ago
omar
9e3a807813
Removed comments
7 years ago
omar
057807f4a7
Added ImGuiKey_Space, mapped in every examples. Will be required for navigation. ( #787 )
7 years ago
omar
7e32fc7109
Nav: Toward automatically mapping keyboard input. Renamed ImGuiNavInput_PadXXX to ImGuiNavInput_XXX. Renamed ImGuiNavInput_KeyXXX to ImGuiNavInput_KeyXXX_ (internal). ( #787 )
7 years ago
omar
ed4bbc4fd4
Nav: Comments, guides.
7 years ago
omar
cea8017e0b
Merge branch 'master' into context
7 years ago
omar
3b7bd4563a
ImVec2: added [] operator. This is becoming desirable for some types of code, better added sooner than later.
7 years ago
omar
ad09396672
ImVec2: added [] operator. This is becoming desirable for some types of code, better added sooner than later.
7 years ago
omar
92ee6b1185
Nav: Sets io.WantCaptureKeyboard when navigation is active. This is a little agressive but probably the best default and also a good way to get feedback. Added ImGuiNavFlags_NoCaptureKeyboard to disable this behavior. Comments. ( #787 )
7 years ago
omar
5c83b55d04
Nav: Added ImGuiWindowFlags_NoNav shortcut, comments. ( #787 )
7 years ago
omar
8ad88f725c
Nav: Minor tidying up. ( #787 )
7 years ago
omar
0bd15b52a6
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
7 years ago
omar
147ec8d1e2
Style Added style.MouseCursorScale, may remove ( #939 ).
7 years ago
omar
ce9d7baaba
Nav: TreeNode: Added ImGuiTreeNodeFlags_NavCloseFromChild flag, allow closing a TreeNode() from any of child. The explicit flag is not great, perhaps allowing some form of inheritance would help. ( #787 , #1079 )
7 years ago
omar
27980d9688
Merge branch 'master' into context
7 years ago
omar
23c11e9764
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
7 years ago
omar
dd41a1650a
Comments
7 years ago
omar
bd579e5429
Nav: Removed io.NavUsable --> io.NavActive, io.NavActive --> io.NavVisible. ( #787 ). NavActive takes account of NavFlags enable flags.
7 years ago
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 )
7 years ago
omar
2933e6765c
Merge branch 'master' into navigation
7 years ago
omar
94090eb08f
Added IMGUI_USER_CONFIG to define a custom configuration filename. ( #255 , #1573 , #1144 , #41 )
7 years ago
omar
578016d08b
ImVector comment ( #1577 )
7 years ago
omar
f2d5300408
Nav: Keyboard: Added CTRL+TAB (and CTRL+Shift+TAB) style window selection. ( #787 )
7 years ago
omar
e9070e768e
Nav: Fixed renaming of c09016b12a
that were incorrect. ImGuiNavInput_PadLeft -> PadDpadLeft, _PadScrollLeft -> PadLStickLeft. ( #787 )
7 years ago
omar
5f7f27c8de
Nav: Comments. ( #787 )
7 years ago
omar
f3776055d6
Merge branch 'master' into context
7 years ago
omar
455989b8b1
Nav: Added io.NavFlags to hold various options. Added ImGuiNavFlags_EnableGamepad and ImGuiNavFlags_EnableKeyboard for bindings to use ( #787 )
7 years ago
omar
c09016b12a
Nav: Renamed ImGuiNavInput_PadLeft / etc. to ImGuiNavInput_PadLStickLeft. Renamed ImGuiNavInput_PadScrollLeft to ImGuiNavInput_PadRStickLeft, aka removing trying-too-hard semantic from the enums. ( #787 )
7 years ago
omar
bd278e958e
Nav: Added ImGuiNavInput_KeyLeft/Right/Up/Down set so we can differenciate gamepad/keyboard inputs. ( #787 )
7 years ago
ocornut
680162eb32
Merge branch 'master' into navigation
7 years ago
omar
823e1f0b94
Nav: Reordered NavInput enums to match directional order of ImGuiDir_ and ImGuiKey_ + comments ( #787 )
7 years ago
omar
eb7ec781dc
Nav: Tweak GetNavInputAmount(). Split debug defines.
7 years ago
omar
f6ee8d30fb
Comments ( #1567 )
7 years ago
omar
d500113f1d
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
7 years ago
omar
9a76fd30fd
Added SetNextWindowBgAlpha() helper. ( #1567 ) particularly helpul with the marking of the old 5-parameters version of Begin() as obsolete.
7 years ago
omar
2645ab5f7f
Comments + added legacy renamed GetItemsLineHeightWithSpacing() as stated in the doc, fixes 6190ab0084
7 years ago
omar
13c407591e
Nav: Comments, tweaks
7 years ago
omar
9076366c17
Style: Exposed ImGuiStyleVar_WindowTitleAlign, ImGuiStyleVar_ScrollbarSize, ImGuiStyleVar_ScrollbarRounding, ImGuiStyleVar_GrabRounding + added an assert to reduce accidental breakage. ( #1181 )
7 years ago
omar
9edf211c0e
Merge branch 'master' into navigation
7 years ago
omar
5e2aa6185c
Reorganized context handling to be more explicit,
...
- YOU NOW NEED TO CALL ImGui::CreateContext() AT THE BEGINNING OF YOUR APP, AND CALL ImGui::DestroyContext() AT THE END.
- removed Shutdown() function, as DestroyContext() serve this purpose.
- you may pass a ImFontAtlas* pointer to CreateContext() to share a font atlas between contexts. Otherwhise CreateContext() will create its own font atlas instance.
- removed allocator parameters from CreateContext(), they are now setup with SetAllocatorFunctions(), and shared by all contexts.
- removed the default global context and font atlas instance, which were confusing for users of DLL reloading and users of multiple contexts
(#1565 , #586 , #992 , #1007 , #1558 )
7 years ago
omar
7e4d28a49d
Context: Renamed SetMemoryAllocators() to SetAllocatorFunctions(). Tweaked comments. ( #1565 , #586 , #992 , #1007 , #1558 )
7 years ago
omar
5a301c29dc
Context: Removed allocator parameters from CreateContext(), they are now setup with SetMemoryAllocators() and shared by all contexts. ( #1565 , #586 , #992 , #1007 , #1558 )
7 years ago
omar
5eb293c879
ImFontAtlas: Added TexUvScale (= 1.0f / (float)TexWidth, 1.0f / (float)TexHeight)
7 years ago
omar
cd1409f4bf
ImFontAtlas: Moved mouse cursor data out of ImGuiContext, fix drawing them with multiple context. Also remove the last remaining undesirable dependency on GImGui in imgui_draw.cpp, finishing the work recently done with ImDrawListSharedData. Hurra! ( #939 )
7 years ago
omar
0b1fecb792
Horizontal mouse wheel: renamed io.MouseHorizWheel to io.MouseWheelH. Reorganized the code in NewFrame(). Examples: Updated GLFW+GL and SDL+GL accordingly. ( #1463 )
7 years ago
omar
6f6b6194b2
Merge branch 'tseeker/20171127-feature-horiz-wheel' of https://github.com/tseeker/imgui into tseeker-tseeker/20171127-feature-horiz-wheel
...
# Conflicts:
# examples/sdl_opengl2_example/imgui_impl_sdl_gl2.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
7 years ago
omar
8877622fa8
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
7 years ago
omar
c2ffce3e5a
Drag and Drop: Fix comment. Removed IMGUI_PAYLOAD_TYPE_DOCKABLE from master branch. ( #143 )
7 years ago
omar
63d47e8328
Drag and Drop: Increased payload type string to 12 characters instead of 8.( #143 )
7 years ago
omar
932d3f0198
NewFrame(): Added an assert to detect incorrect filling of the io.KeyMap[] array earlier. ( #1555 ) + comments.
7 years ago
omar
d1f726cd9d
Comments about Begin/End pair and handling of return value.
7 years ago
omar
472ba1394c
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
7 years ago
omar
28a76af185
Internal: DrawData: Tidying, renaming.
7 years ago
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 )
7 years ago
omar
cd7e178eac
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
7 years ago
omar
398a4e1865
Made obsolete IsAnyWindowHovered()/IsAnyWindowFocused() static inline. static only tends to trigger warnings. ( #1382 )
7 years ago
omar
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
omar
fe919995da
Merge branch 'master' into navigation
7 years ago
omar
ce95b84825
Added ImGuiKey_Insert for future use. Setup in all example bindings. ( #1541 )
7 years ago
omar
168200f915
Popups: Comments, reorganize bits of the header section, renamed parameters.
7 years ago
omar
a8e5542d78
BeginPopup: Exposed extra_flags publicly. ( #1533 )
7 years ago
omar
66b2ee6ea2
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
7 years ago
omar
407955d9fb
Examples: Using IM_OFFSETOF macro. + Comments
7 years ago
omar
2b8224692e
Merge branch 'master' into navigation
7 years ago
omar
0a0b252bb6
DragDrop: Removed IsDragDropActive() (introduced a few days ago, revert 06bea369c0
) as our use case doesn't need it anymore. Will add it if there is a real need.
7 years ago
omar
9fbecac87e
Demo: Improved Selectable() examples. ( #1528 )
7 years ago
omar
96ccc484f9
Merge branch 'master' into navigation
...
# Conflicts:
# imgui_internal.h
7 years ago
omar
3c6fbe0849
Renamed ImGuiSizeConstraintCallback to ImGuiSizeCallback, ImGuiSizeConstraintCallbackData to ImGuiSizeCallbackData.
7 years ago
omar
7a15fc8de5
Merge branch 'master' into navigation
7 years ago
omar
fbf2435f38
Exposed IM_OFFSETOF() helper in imgui.h
7 years ago
omar
eef9120e07
Reorganized comments in the IMGUI_DISABLE_OBSOLETE_FUNCTIONS function. Added an IM_ASSERT(0).
7 years ago
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
.
7 years ago
omar
c4e6d622c1
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
7 years ago
omar
06bea369c0
DragDrop: Added IsDragDropActive() helper which is useful for binding to decide how to handle mouse inputs.
7 years ago
omar
49eed6e2d1
Version 1.54 WIP
7 years ago
omar
436cad4bca
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.h
7 years ago
omar
d9034bf2d8
ListBox() changed signature of ListBox() to match Combo(). Still not very happy about not using const char** anymore. ( #931 )
7 years ago
Branimir Karadžić
149523a101
Fixing error: declaration of ‘size’ shadows a member of 'this' [-Werror=shadow]
7 years ago
omar
e916310b2e
Version 1.53
7 years ago
omar
3d48f5b8c2
Demo: BeginCombo() demo code
7 years ago
omar
de5c304b49
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
7 years ago
omar
1b86e7343f
Renamed the emblematic ShowTestWindow() function to ShowDemoWindow(). Kept redirection function (will obsolete).
7 years ago
omar
b1930c5672
Merge branch 'master' into navigation
7 years ago
omar
e9ceef4762
ImVector: Revert 6172e93272
actually problematic with our current use (because we don't construct the instances).
7 years ago
omar
ffb4f6ca8c
Merge branch 'master' into navigation
7 years ago
omar
a5739a0aa3
Fixed warning with Clang+MSVC using __int64 to define the helper ImU64 type ( #1184 )
7 years ago
omar
69879dd4f3
ImVector: Spacing.
7 years ago
omar
8e8b5498f7
ImVector: insert() uses grow_capacity() - had inconsistent resize policy
7 years ago
omar
6172e93272
ImVector: Added assignments and = operators + comments.
7 years ago
omar
1f26652944
Various zealous warning fixes (thanks Clang).
7 years ago
omar
287380261c
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
7 years ago
omar
996dfb21cf
ImDrawList: Added ImDrawListFlags for AA settings. ImDrawList doesn't directly depends on GImGui anymore.
7 years ago
omar
14cb8177d0
ImDrawList: Removed 'bool anti_aliased = true' final parameter of ImDrawList::AddPolyline() and ImDrawList::AddConvexPolyFilled(). Anti-aliasing is controlled via the regular style.AntiAliased flags.
7 years ago
omar
531c11d5c7
ImDrawList: Small refactor toward removing dependency on GImGui + PushClipRectFullscreen now correctly uses data provided by imgui which can takes account of DisplaySize + Removed static variable in PathArcToFast() which caused linking issues to some.
7 years ago
omar
230f826ef5
ImDrawList: Comments
7 years ago
omar
4c2514dc29
Merge branch 'master' into navigation
7 years ago
omar
55c0d2b9ab
InputText: renamed ImGuiInputTextFlags_DisableUndo to ImGuiInputTextFlags_NoUndoRedo ( #1506 , #1508 )
7 years ago
ibachar
abaf347deb
Added a flag for text input to disable undo / redo
7 years ago
omar
6497f5dc1b
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.h
7 years ago
omar
0c6e260f73
Drag and Drop: Added ImGuiDragDropFlags_SourceExtern to facilitate interfacing with WM_DROPFILES ( #143 )
7 years ago
omar
51433e26af
Drag and Drop: Renamed to ImGuiDragDropFlags_SourceNoAutoTooltip to ImGuiDragDropFlags_SourceNoPreviewTooltip ( #143 )
7 years ago
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 )
7 years ago
omar
45bca7851d
Added ImGuiHoveredFlags_RootAndChildWindows helper for consistency with focused flags. ( #1382 )
7 years ago
omar
5f39758202
Minor tweaks, comments, spacing fixes
7 years ago
omar
cc3192f347
Merge branch 'master' into navigation
...
# Conflicts:
# imgui_internal.h
7 years ago
omar
3905816082
Added ShowFontSelector(), ShowStyleSelector(). ( #707 )
7 years ago
omar
16fb58984f
Merge branch 'master' into navigation
7 years ago
omar
90788a1242
ImVector: Added ImVector::contains() helper
7 years ago
omar
7c7a7baf76
Merged miscellaneous small stuff (from nav/dock branches).
7 years ago
omar
b174fcc9af
Added IsAnyWindowFocused() (from Nav branch).
7 years ago
omar
fa9327ccf8
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_draw.cpp
# imgui_internal.h
7 years ago
omar
e98df91dc4
Drag and Drop: Added ImGuiCol_DragDropTarget ( #143 , #707 )
7 years ago
omar
7ec934f439
Drag and Drop: Comments
7 years ago
omar
052b6021dd
Merge branch 'master' into drag_and_drop
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_internal.h
7 years ago
omar
0a3db267c3
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_demo.cpp
# imgui_internal.h
7 years ago
omar
6190ab0084
Renamed GetItemsLineHeightWithSpacing() to GetFrameHeightWithSpacing()
7 years ago
omar
c22657985a
Added GetFrameHeight() function (used to be SmallSquareSize internally)
7 years ago
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).
7 years ago
omar
fa179d0ad8
Reordered ImGuiHoveredFlags to match upcoming ImGuiFocusedFlags ( #1382 )
7 years ago
omar
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
omar
185c1eaaf3
Alignment + removed comments
7 years ago
omar
f93945540f
Renamed ImGuiTreeNodeFlags_AllowOverlapMode to ImGuiTreeNodeFlags_AllowItemOverlap. ( #600 , #1330 )
7 years ago
omar
6b168b43ff
Comments ( #822 )
7 years ago
omar
2b9d8ab91d
Merge branch 'master' into drag_and_drop
...
# Conflicts:
# imgui.cpp
# imgui.h
7 years ago
omar
38bfdb357e
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
7 years ago
omar
f06f68f3ce
Obsoleted old functions: SetScrollPosHere (marked obsolete in 1.42, July 2015). GetWindowFont(), GetWindowFontSize() (marked obsolete in 1.48, March 2016)
7 years ago
omar
9fd15defe4
Added an implementation of SetItemDefaultFocus() in the master branch for combo patterns to use and be more forward-compatible. ( #787 )
7 years ago
omar
d1db229907
Merge branch 'master' into navigation
...
# Conflicts:
# imgui_demo.cpp
7 years ago
omar
1096e14356
ImFont: Added GetDebugName() helper.
7 years ago
omar
e3e0326ea9
Exposed BeginCombo() publicly.
7 years ago
omar
080f61858f
Sorted typedefs/enumations forward declarations in imgui.h
7 years ago
omar
eab6333a0b
SetNextWindowContentSize() adjust for client->window size, but the fate of borders isn't really clear for now (until now we always tried to make borders not affect layout, so if we want a 200x200 fully visible space with borders and zero window padding user need to include the borders) ( #1490 )
7 years ago
omar
0872020c5c
Comments
7 years ago
omar
f72b002da8
Removed SetNextWindowContentWidth(), prefer using SetNextWindowContentSize(). Kept redirection function (will obsolete). ( #246 , #519 , #1444 )
7 years ago
omar
871a5cecc1
Merge branch 'master' into navigation
7 years ago
omar
c9f0275e22
Combo: Removed ImGuiWindowFlags_ComboBox flag. Moved internal window flags.
7 years ago
omar
7bf85db6c4
Drag and drop: Added COL3F payload for color without alpha overwrite. Exposed standard color payload types in imgui.h ( #143 )
7 years ago
omar
553b0fcf8f
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
7 years ago
omar
97edd42fc0
Indent(), Unindent(): Allow passing negative values.
7 years ago
omar
e6215b6ca0
Merge branch 'master' into navigation + merge fix
...
# Conflicts:
# imgui.cpp
7 years ago
omar
94bf12f14b
Demo: Display better mouse cursor info for debugging backends.
7 years ago
omar
20c7aab60c
Exposed GetOverlayDrawList(). (~#545, ~#530)
7 years ago
omar
3b7e4eaf38
Comments about ImGuiWindowFlags_ResizeFromAnySide. Removed hovering color. May need its own color. ( #822 )
7 years ago
omar
90ae1c59c4
Added ImGuiWindowFlags_ResizeFromAnySide flag and code to resize from any of the 4 corners (only 2 corners enabled). ( #822 )
7 years ago
omar
729333293c
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
7 years ago
omar
0f119865a6
Comments about ImGuiWindowFlags_ResizeFromAnySide. Removed hovering color. May need its own color. ( #822 )
7 years ago
omar
2ca4f9e862
Added ImGuiWindowFlags_ResizeFromAnySide flag and code to resize from any of the 4 corners (only 2 corners enabled). ( #822 )
7 years ago
omar
63712d5f5c
Merge branch 'master' into drag_and_drop
7 years ago
omar
9191b17218
Merge branch 'master' into navigation
7 years ago
omar
4c4f1b0224
ImVector: Added ImVector::push_front helper.
7 years ago
Emmanuel Benoît
77a310736d
Horizontal mouse wheel support
...
This patch adds support for the horizontal mouse wheel in ImGui. It
affects windows that can be scrolled, as long as the Ctrl key is not
being pressed.
The scrolling speed has been set empirically so that it matches the
scrolling speed on the Firefox browser when the horizontal wheel is
used.
Internally, it adds a MouseHorizWheel to ImGuiIO, which is then used in
NewFrame to scroll the current window.
The SDL/GL2, SDL/GL3, GLFW/GL2 and GLFW/GL3 examples has been modified
to use it.
7 years ago
omar
532f564fd3
ImGuiTextBuffer: Renamed append() helper to appendf(), appendv() to appendfv(). Added reserve().
7 years ago
omar
d9c5d72962
ImGuiStorage: Added BuildSortByKey() helper to rebuild storage from stratch.
7 years ago
omar
2543807e56
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
7 years ago
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).
7 years ago
omar
31683cfe34
ImDrawList::AddImageRounded: removed PrimDistributeUV declaration, fixed coding style, restored argument order from original PR. ( #845 )
7 years ago
omar
ba095f81a5
Merge branch '2016-08-rounded-image' of https://github.com/thedmd/imgui into thedmd-2016-08-rounded-image
7 years ago
omar
8c0f2e4946
Added comment to help people dealing with 58345b11e1
breakage ( #707 )
7 years ago
thedmd
79f07f6ff0
Add AddImageRounded() to ImDrawList
7 years ago
omar
92212b17aa
Merge branch 'master' into drag_and_drop
7 years ago
omar
9848a7023b
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
7 years ago
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 )
7 years ago
omar
c433bc971f
Reorder fields for consistency.
7 years ago
omar
39137ccc3e
Style: renamed ImGuiCol_ChildWindowBg to ImGuiCol_ChildBg. ( #707 )
7 years ago
omar
9886b09a0a
Minor tweak, removed extraneous empty destructor.
7 years ago
Jason Wilkins
e605f21797
TreePush with zero arguments was ambiguous. Resolved by making it call TreePush(const void*)
7 years ago
omar
9a44d447cd
NewFrame() now asserts if neither Render or EndFrame have been called. Exposed EndFrame(). Made it legal to call EndFrame() more than one. ( #1423 etc.)
7 years ago
omar
d211a0e338
Merge branch 'master' into navigation (with style breakable)
...
# Conflicts:
# imgui.cpp
# imgui_draw.cpp
7 years ago
omar
4022ada843
Merge branch 'master' into drag_and_drop
7 years ago
omar
4daf377c9b
Added comment about TextUnformatted(). ( #1450 )
7 years ago
omar
d7af1a218e
Style: Added PopupRounding setting. ( #1112 )
7 years ago
omar
0a61b7195c
Style: Added a default StyleColorsLight(). ( #707 )
7 years ago
omar
58345b11e1
Style: Removed ImGuiCol_ComboBg in favor of combo boxes using ImGuiCol_PopupBg for consistency. ( #707 )
7 years ago
omar
bd4bc929ce
Style: renamed style.ChildWindowRounding to style.ChildRounding, ImGuiStyleVar_ChildWindowRounding to ImGuiStyleVar_ChildRounding.
7 years ago
omar
7746dd104c
Merge branch 'master' into drag_and_drop
7 years ago
omar
6817f3a3d9
Merge branch 'master' into navigation
7 years ago
omar
f5bdf443c9
Minor comments, tweaks
7 years ago
omar
ae060b1d67
Merge branch 'master' into drag_and_drop
7 years ago
omar
ffad688fc8
Drag and Drop: Added payload->IsPreview() to user can render their custom preview while handling overlapping drop targets. ( #143 )
7 years ago
omar
2275cb8b83
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
7 years ago
omar
30bf40195b
io.OptNoCursorBlink -> io.OptCursorBlink ( #1427 )
7 years ago
omar
669498ff26
Added io.OptNoCursorBlink option to disable cursor blinking. ( #1427 ). Renamed io.OSXBehaviors to io.OptMacOSXBehaviors. Should affect users as the compile-time default is usually enough. ( #473 , #650 )
7 years ago
omar
0d4c320f88
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_draw.cpp
7 years ago
omar
de1e7dc088
Drag and Drop: Moved internal fields out of public sight. ( #143 )
7 years ago
omar
8b725c94cb
Drag and Drop: Rework internal to allow overlapping targets ( #143 )
7 years ago
omar
3461a2f296
Merge branch 'master' into drag_and_drop
7 years ago
omar
ff4d4ca651
IsWindowHovered(): Added ImGuiHoveredFlags_FlattenChilds flag. Made IsRootWindowOrAnyChildHovered() obsolete in favor of IsWindowHovered( ImGuiHoveredFlags_FlattenChilds) ( #1382 , #1404 )
7 years ago
Giuseppe Barbieri
6fb43f2011
Update imgui.h
7 years ago
omar
66f42324ad
Drag and Drop: Added ImGuiDragDropFlags_SourceNoHoldToOpenOthers flag.
7 years ago
omar
63f6f2dd13
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
7 years ago
omar
fba704bf5d
Examples: Added a bunch of comments/referencs related to io.WantCaptureMouse, io.WantCaptureKeyboard ( #1262 , #1237 , #1219 , #635 , #1058 , #1051 , #912 , #533 , #703 , #446 , #459 , #364 , #213 , #52 , and more)
7 years ago
omar
59323b54da
Demo: Comments ( #1408 )
7 years ago
omar
7f06d385a1
Added assertions and comments for incorrect use/understanding of IsWindowFocused() etc. functions
7 years ago
omar
0e775807b4
Drag and Drop: Added a mechanism to allow widgets with no identifiers (such as Text/Image) to be used with BeginDragDropSource() given the explicit ImGuiDragDropFlags_SourceAllowNullID flag.
7 years ago
omar
acf78da742
Drag and drop: moved to imgui.h
7 years ago
omar
cb38caeda4
Examples: Added more comments near the fonts loading section, to catch common questions and errors (e.g. #1397 , #1366 , #1341 , #1222 , #1193 , #1115 , #951 , etc.)
7 years ago
omar
edafbcd630
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
7 years ago
omar
c503a50cff
Styles: Moved Classic colors code to imgui_draw.cpp. Sneakily added a StyleColorsDark() function.
7 years ago
omar
77df1ba9e0
Version 1.53 WIP
7 years ago
omar
b422f35872
IO: Tracking extra mouse dragging data which is convenient for implementating various manual drag and drop patterns.
7 years ago
omar
c0b366b316
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.h
7 years ago
omar
9f200d10d5
Version 1.52
7 years ago
omar
5afee1c6f3
Merge branch 'master' into navigation
...
# Conflicts:
# imgui_internal.h
7 years ago
omar
8dd7648db2
Comments
7 years ago
omar
3656f2c769
NewFrame: Allow MovedWindow setting the ImGuiWindowFlags_NoInputs after moving has started in order to be able to detect windows below it, which is useful for e.g. docking mechanisms.
7 years ago
omar
f10a1d7b9e
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
7 years ago
omar
a6ff14d66e
Exposed IM_ARRAYSIZE() in imgui.h
7 years ago
omar
f6ff373b22
Nav: #define IMGUI_HAS_NAV to ease sharing code across branches of imgui
7 years ago
omar
6f0aa766e1
Nav: Added internal ImGuiNavReadMode_Released test for key releases.
7 years ago
omar
d769e2515a
Merge branch 'master' into navigation
7 years ago
omar
7f880674e5
Font: Renamed ImFont::Clear() to ImFont::ClearOutputData() for consistency with what ImFontAtlas does. DisplayOffset is set by constructor but not reset by ClearOutputData. ( #1349 )
7 years ago
omar
5fa81f2a26
Nav: Added ImGuiNavInput_KeyMenu aside from ImGuiNavInput_PadMenu as it is one differenciator between pad and keyboard that's very annoying with the keyboard.
...
Remove the move/resize behavior that appears than holding the button for a while. (#787 )
7 years ago
omar
e4bb9102f9
Merge branch 'master' into navigation
7 years ago
omar
43df7eb5ea
Added OpenPopupOnItemClick(); helper which mimic BeginPopupContextItem() but doesn't do the open.
...
Made the color popups uses this standard function so they handle reopening a context menu.
7 years ago
omar
1172ff62e1
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_demo.cpp
# imgui_internal.h
7 years ago
omar
564ff2dfd3
IsItemHovered(), IsWindowHovered(): added flags to enable various and more specific behavior. Will enable improvements for popups/context menus and drag'n drop. (relate ~#439, #1013 , #143 , #925 )
...
The legacy confusing IsItemRectHovered(), IsWindowRectHovered() can be completely removed now.
Changed IsWindowHovered() behavior with default parameter: it now return false is the window is blocked by a popup.
Demo: Added tests for those two functions.
7 years ago
omar
d29a6a5a5a
Moved IMGUI_DISABLE_OBSOLETE_FUNCTIONS block lower in the imgui.h file so obsolete functions can use flags. Also sane to quarantine them outside of the respectable area.
7 years ago
omar
e384078d7a
IO: reordering some supposedly private fields.
7 years ago
omar
d96b6ecf88
Merge branch 'master' into navigation
...
# Conflicts:
# imgui_demo.cpp
7 years ago
omar
03b76bf05b
Begin: Marked 5 parameters version of Begin() as obsolete. Now waiting for a riot to happen!
7 years ago
omar
1a35766356
BeginPopupContextItem() now supports a NULL string identifier and uses the last item ID if available. For interactive items (that have an ID) this works! For non interactive items we assert.
7 years ago
omar
d761825cfb
Nav: Renaming a field + Comments.
7 years ago
omar
3833f1f7a2
Merge branch 'master' into navigation
7 years ago
omar
43b4a81b3e
Rnamed AlignFirstTextHeightToWidgets() to AlignTextToFramePadding(). Kept inline redirection function (will obsolete).
7 years ago
omar
c6e370a77a
TreeNode: Added ImGuiTreeNodeFlags_FramePadding flag
7 years ago
omar
4d83078885
Nav: Moving code next to its peers
7 years ago
omar
6e1199c603
Merge branch 'master' into navigation
7 years ago
omar
335c8dd159
Comments (clarifying whether types are to be considered as flags or regular, non combinable enums)
7 years ago
omar
59c6f35bf6
Added ActivateItem(), GetItemID() functions.
7 years ago
omar
a3d0755181
Merge branch 'master' into navigation
7 years ago
omar
a8788e51a7
SetKeyboardFocusHere() added assert to prevent passing values smaller than -1 as we may have to outlaw them (I think nobody was using that)
7 years ago
omar
3ddcdcf6e7
Merge branch 'master' into navigation
7 years ago
omar
67ac7da30f
Styles: Added ImGuiStyle::ScaleAllSizes(float) helper to make it easier to have application transition to e.g. High DPI with a matching style.
7 years ago
omar
ca4db8c905
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
7 years ago
omar
f99348711b
Added VerticalSeparator() entry point in imgui_internal. Seperator() in an horizontal layout context still does that.
7 years ago
omar
a2b2e56e8e
Merge branch 'master' into navigation
7 years ago
omar
09f6f564d9
ImFontAtlas: Fixed calling Clear() and rebuilding (broken in 3fe2ecfd4c
) thanks @pdoane @mikesart
7 years ago
omar
8fd4beddb8
Merge branch 'master' into navigation
7 years ago
omar
3fe2ecfd4c
ImFontAtlas: Added support for CustomRect API to submit custom rectangles to be packed into the atlas / and map them as font glyphs
7 years ago
omar
501e73feed
Minor comments
7 years ago
omar
9e1ad7295f
ImFont: Renamed (supposedly internal) fields (e.g. XAdvance to AdvanceX). Custom text renderers might be affected if they didn't use the GetCharAdvance() helper function.
7 years ago
omar
10bb9524eb
ImFont: Renamed ImFont::Glyph to ImFontGlyph (for consistency and so ImFontAtlas types can use it without ordering half of the file). Left a redirection type.
7 years ago
omar
2170b0b278
ImFontAtlas: Comments and minor reorganization of declaration in header file.
7 years ago
omar
529ca279a4
ImFont: Split some building code into a AddGlyph() helper (that custom rect code and imgui_freetype can use)
7 years ago
omar
f1a20ec66d
Merge branch 'master' into navigation
7 years ago
omar
728deff56c
Comments, debug code (commented), todo list
7 years ago
omar
99b9f1c93c
Fix static misusage error with decent compilers. Error introduced in 4b82759598
7 years ago
omar
7e8069dd23
Merge branch 'master' into navigation
7 years ago
omar
4b82759598
SetNextWindowPos: added a ImVec2 pivot parameter for positioning a given a center, bottom-right position, etc. As a generalization of SetNextWindowPosCenter() which is now obsolete. This will be useful for combo-like popups as well.
...
Demo: Simple-overlay window uses the SetWindowPos pivot to select a corner to position itself at.
7 years ago
omar
92e55a8a79
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.h
7 years ago
omar
1ff27d7db8
Added io.WantMoveMouse flags from Nav branch so Examples/Binding can already implement it. ( #787 )
7 years ago
omar
44e8d94aba
Merge branch 'master' into navigation
7 years ago
omar
709653c330
Merge branch 'master' into styles
7 years ago
omar
62d7fa4324
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
7 years ago
omar
f63c03c464
Internals: moved ButtonRepeat and AllowKeyboardFocus bools/stacks to a generic ItemFlags stack. Merged from Navigation branch.
7 years ago
omar
5c4fda0fbc
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
7 years ago
omar
804ee78731
Added IsWindowAppearing().
7 years ago
omar
fd684ba974
Removed 2 obsolete redirection functions (obsoleted 26+ months ago).
7 years ago
omar
a9e1d9aab9
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_internal.h
7 years ago
omar
358e7a194e
Added GetKeyPressedAmount() (from Nav branch) to be able to measure fast repeat rate accurately. Added internal CalcTypematicPressedRepeatAmount() function.
7 years ago
omar
ee42fae468
Merge various minor things (supposedly harmless) from Navigation branch into Master to reduce differences. ( #787 )
7 years ago
omar
807322c9a5
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
7 years ago
omar
5938f1ba61
Added IsMousePosValid() helper.
7 years ago
omar
f72ca6d22c
ImFontConfig: Added RasterizerMultiply option to alter the brightness of individual fonts at rasterization time, which may help increasing readability for some. Added RasterizerFlags for custom rasterizer flags (aka imgui_freetype)
7 years ago
omar
304de0ee1b
ImFontConfig: Comments, const.
7 years ago
omar
92a6faca6f
IO: io.MousePos needs to be set to ImVec2(-FLT_MAX,-FLT_MAX) when mouse is unavailable/missing. Previously ImVec2(-1,-1) was enough but we'll now accept negative mouse coordinates.
7 years ago
omar
37f3a718c6
Marked all fmt + va_list functions with format attribute so GCC/Clang can warn about them. Not ignoring -Wsuggest-attribute=format anymore for GCC/Clang.
7 years ago
omar
40f608ce9b
Version 1.52 WIP
7 years ago
omar
55a6209931
Version 1.51
7 years ago
omar
6ed75d3046
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
7 years ago
omar
eb2bbf6f29
Renamed IsItemHoveredRect() to IsItemRectHovered(). Renamed IsMouseHoveringWindow() to IsWindowRectHovered() - follow up to previous commit 6be7d4904e
merged from Nav.
7 years ago
omar
52b39af0a0
Style: Added obsolete redirects for ImGuiCol_Columns*** fields. (ref 648f75b245
)
7 years ago
omar
6be7d4904e
Merge part of 88c1966629
from Nav branch. Renamed IsMouseHoveringAnyWindow() -> IsAnyWindowHovered(), IsMouseHoveringWindow() -> IsWindowHoveredRect() for consistency. Kept inline rediection function.
7 years ago