256 Commits (869732c456619af9e5eeb883b6f1e692d8b9c44c)

Author SHA1 Message Date
omar a2b2e56e8e Merge branch 'master' into navigation 7 years ago
omar 8374a454da Removed extraneous ImGui:: prefixes. Declared ColorEditOptionsPopup in imgui_internals.h. Tweaked internal signatures. 7 years ago
omar 8fd4beddb8 Merge branch 'master' into navigation 7 years ago
omar 072d6d8cb5 ImFontAtlas: Refactored internals API to 1) avoid building lookup table multiple times for merged fonts + 2) allow the mapping of custom icons inside fonts (wip, uncommited) 7 years ago
omar f1a20ec66d Merge branch 'master' into navigation 7 years ago
omar be03882a15 Separator(): output vertical separator when used in horizontal layout mode, so it works in menu bars. 7 years ago
omar 69d0d33451 Exposed PushMultiItemsWidths() to imgui_internal.h 7 years ago
omar 7e8069dd23 Merge branch 'master' into navigation 7 years ago
omar 0d56140b4a BeginCombo(): rework internals a little to make it easier to provide custom combo-like elements relying in BeginCombo().
BeginPopupEx() doesn't enforce AlwaysAutoResize flag anymore.
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 0a5fb24f10 Popups: Exposing a little more of popups internals in imgui_internals.h 7 years ago
omar 44e8d94aba Merge branch 'master' into navigation 8 years ago
Bruce Mitchener 2fcdeb7f12 Remove commas after last item in enumeration.
This brings these enums to match the rest of the code and fixes
2 warnings under clang about using C++11 extensions.
8 years ago
omar 66a9d4856c Merge branch 'master' into navigation
# Conflicts:
#	imgui_internal.h
8 years ago
omar cb2775ae54 Internals: ImGuiItemFlags comments 8 years ago
omar 62d7fa4324 Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
#	imgui_internal.h
8 years ago
omar f63c03c464 Internals: moved ButtonRepeat and AllowKeyboardFocus bools/stacks to a generic ItemFlags stack. Merged from Navigation branch. 8 years ago
omar 5c4fda0fbc Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
#	imgui_internal.h
8 years ago
omar 2169bf6895 Fixed WantTextInput from being true when an activated Drag or Slider was previously turned into an InputText(). (#1317) 8 years ago
omar 790605e359 Minor comments + renaming internal fields 8 years ago
omar e8dbf1c795 Combo: Internally split into BeginCombo(), EndCombo(), toward a more flexible combo api. 8 years ago
omar 804ee78731 Added IsWindowAppearing(). 8 years ago
omar ddf41b0398 Merged from Navigation branch. TAB/Alt-TAB processing now deactivate if holding Ctrl. 8 years ago
omar 358e7a194e Added GetKeyPressedAmount() (from Nav branch) to be able to measure fast repeat rate accurately. Added internal CalcTypematicPressedRepeatAmount() function. 8 years ago
omar ee42fae468 Merge various minor things (supposedly harmless) from Navigation branch into Master to reduce differences. (#787) 8 years ago
omar 2ee1b70652 Merge branch 'master' into navigation
# Conflicts:
#	imgui_internal.h
8 years ago
omar 01d4bf299a Added overcomplicated RenderRectFilledRangeH() to fix rounded progress bar, which will also help for range widgets and perhaps sliders grabs over rounded areas. (#1296, #76) 8 years ago
omar 7a9ea281be ImSwap() helper. 8 years ago
omar 1f51e8f39d Internals: Renamed some ImGuiCorner enums. 8 years ago
omar 807322c9a5 Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
8 years ago
omar 419b22a487 Internals: Split some code out of NewFrame() into an Initialize() function. 8 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) 8 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. 8 years ago
omar 40f608ce9b Version 1.52 WIP 8 years ago
omar 55a6209931 Version 1.51 8 years ago
omar 141339e4b7 (internals) Renamed FocusedWindow to NavWindow to match terminology of navigation branch 8 years ago
ocornut 2ad2190d47 Merge 20a0fde012 Tidying up default clipboard handler for non Windows-OS (from Nav branch) 8 years ago
omar bea06117bb Nav: Fix navigation inside child windows. Removed GetChildID() and storin/g the info within the window. (#1291) 8 years ago
ocornut 50b3a14d0a Merge 2545d75c3b from Nav - Tidying up, removed two unnecessary window flags from being exposed in imgui.h 8 years ago
omar d5b0d51274 Minor miscellaneous merges from Navigation branch to reduce divergence a little bit 8 years ago
omar 9670fe9ca7 Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
#	imgui_internal.h
8 years ago
omar 6ee317d26d ImRect::Clip() -> ClipWith() to clarify meaning, going to undo the change in Nav branch. 8 years ago
omar 53e73182ff Merge branch 'master' into navigation
# Conflicts:
#	imgui_internal.h
8 years ago
omar 530baee1a7 Removed tabs that slipped through the cracks 8 years ago
omar 067127f113 Columns: Caching columns clipping rectangles (#125) 8 years ago
omar adeaf1cd72 Columns: Moved PushColumnClipRect() to imgui_internal.h 8 years ago
omar 1c83b073c6 Columns: A set of column (and most importantly the right-most column) do not register its content to the parent, not affecting the window contents size. (#519, #125, #913) 8 years ago
omar 7f0063f858 Columns: Added ImGuiColumnsFlags_NoResize flag (internal). (#913, #125) 8 years ago
omar 19a42cb2fd Columns: Moved BeginColumns/EndColumns/flags from #913 to imgui_internals.h + minor shallow tweaks. Removed demo code temporarily. (#125) 8 years ago
omar bc78535bbf Merge branch 'master' of https://github.com/ggtucker/imgui into ggtucker-master
# Conflicts:
#	imgui.cpp
#	imgui.h
8 years ago