mirrors
/
imgui
mirror of https://github.com/ocornut/imgui
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,107 Commits 10 Branches 119 Tags 239 MiB
Commit Graph

3107 Commits

Author SHA1 Message Date
omar f1a20ec66d Merge branch 'master' into navigation 2017-09-26 16:54:37 +02:00
omar be03882a15 Separator(): output vertical separator when used in horizontal layout mode, so it works in menu bars. 2017-09-26 15:43:48 +02:00
omar c7a606ab7e Horizontal layout does the minimum job to be usable internally - not exposed (#97) 2017-09-26 15:42:55 +02:00
omar 728deff56c Comments, debug code (commented), todo list 2017-09-26 15:33:57 +02:00
omar 99b9f1c93c Fix static misusage error with decent compilers. Error introduced in 4b82759598 2017-09-26 11:23:06 +02:00
omar 82748df71a WantCaptureMouse: Tweaked logic so WantCaptureMouse can stay false when e.g. hovering over void while an InputText() is active. (#621) 2017-09-26 01:12:09 +02:00
omar 69d0d33451 Exposed PushMultiItemsWidths() to imgui_internal.h 2017-09-25 22:45:10 +02:00
omar 9577ebf008 Merge branch 'master' into navigation 2017-09-25 22:14:37 +02:00
omar 24f21bd4d4 Merge pull request #1113 from Urmeli0815/ImGuiSelectableFlags_MenuItem 
MenuItem: only activate on Release, not on Click (nb: and not on ClickRelease to allow opening menu and selecting something with a single click. Windows seems to behave the same, allowing to click and hold to e.g. Open then move cursor, release on Save and save gets activated)
 2017-09-25 22:13:38 +02:00
omar 7e8069dd23 Merge branch 'master' into navigation 2017-09-25 22:08:38 +02:00
omar c0547d358d Begin: Fixed auto-fit calculation code that predict the presence of ascrollbar so it works in the case size constraints are used. I actually don't need this fix now, but earlier experiment with BeginCombo() required this fix. 2017-09-25 22:04:39 +02:00
omar 4b2781fe87 Begin: Moving some code into a CalcSizeAutoFit() function. 2017-09-25 21:57:42 +02:00
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.
 2017-09-25 21:45:34 +02:00
omar a34edb810e Demo: Fixed overlay demo keeps resizing (in case, e.g.: font changes) 2017-09-25 21:12:07 +02:00
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.
 2017-09-25 18:25:43 +02:00
omar 0a55573288 Begin(): Minor tidying up of flow 2017-09-25 15:48:52 +02:00
omar 9f34925b2a Window: Tweaked ApplySizeFullWithConstraint() -> CalcSizeFullWithConstraint() so it can be used without side-effect 2017-09-25 13:23:25 +02:00
omar 0a5fb24f10 Popups: Exposing a little more of popups internals in imgui_internals.h 2017-09-25 12:52:06 +02:00
omar 3dd3d0b248 Examples: DirectX11: allow creating device with feature level 10 sinec we don't really need much for that example. (#1333) 2017-09-24 12:54:49 +02:00
omar b9c185402e Nav: minor tidying up NavUpdate() to use a local variables, easier to test replacing g.NavWindow with g NavMoveResultWindow for navigation accross flattened child windows. 2017-09-20 23:58:56 +02:00
omar 113b2467cd Minor bits. Reduce usage of GImGui multiple times in same function. 2017-09-20 23:02:06 +02:00
omar 229921541b TODO list 2017-09-20 18:54:36 +02:00
omar 9b2672a99f Update README.md 2017-09-19 18:33:04 +02:00
omar 2fc07c1b7d Update README.md 2017-09-19 18:32:09 +02:00
omar ba12d37719 Merge pull request #1324 from waywardmonkeys/improve-clang-warnings 
FIxes zealous Clang warning.
 2017-09-19 18:18:53 +02:00
omar 479e532f18 ColorEdit: fixed weird ternary pattern that makes some compiler warning (fair) 2017-09-18 21:41:49 +02:00
omar 92e55a8a79 Merge branch 'master' into navigation 
# Conflicts:
#	imgui.h
 2017-09-18 16:06:48 +02:00
ocornut d5d825debb Nav/Examples: honoring the io.WantMoveMouse flag in most common examples (#323) 
Missing support Vulkan (#549), Apple (#575, #247), SDL (#58, #356),
Allegro, Marmalade (#368, #375)
 2017-09-18 16:04:44 +02:00
omar 1ff27d7db8 Added io.WantMoveMouse flags from Nav branch so Examples/Binding can already implement it. (#787) 2017-09-18 16:04:28 +02:00
omar f24b5f71ca Merge branch 'master' into navigation 2017-09-18 15:35:47 +02:00
omar 79ce9b74d5 BeginTooltipEx() internal tweaks 2017-09-18 15:35:00 +02:00
omar 44e8d94aba Merge branch 'master' into navigation 2017-09-18 15:32:31 +02:00
omar 105f3b14e4 Merge branch 'master' into styles 2017-09-18 15:11:51 +02:00
omar 564c97b87e Comments 2017-09-18 15:11:22 +02:00
omar f0f86213db ImVector: added resize() variant with initialization value 2017-09-18 15:11:05 +02:00
omar b409d399c8 Demo: style editor output tweak so it is easier to modify the output code.. + TODO list update 2017-09-18 15:09:11 +02:00
omar 9693fd5351 PushStyleVar/PopStyleVar: internal tweaks 2017-09-18 15:07:22 +02:00
omar 7c9e38f60a Style: Moving code in a function to make incoming diff easier to parse. 2017-09-18 15:06:54 +02:00
omar 709653c330 Merge branch 'master' into styles 2017-09-18 15:03:25 +02:00
omar 6c91a1ef7f Minor comments 2017-09-17 23:35:39 +02:00
omar 2aa9a538c0 Merge pull request #1323 from waywardmonkeys/remove-commas-at-end-of-list 
Remove commas after last item in enumeration to stay compatible with older compilers.
 2017-09-15 11:52:14 +02:00
omar c4c042bcec Typo 2017-09-15 01:32:29 +02:00
omar 052999a6ab More consistently uses "Dear ImGui" 2017-09-15 01:31:41 +02:00
omar 83645aa593 More consistently uses "Dear ImGui" 2017-09-15 01:28:30 +02:00
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.
 2017-09-14 10:35:30 +07:00
Bruce Mitchener 4c794be41d Improve warning configuration for clang. 
Clang 4.0 introduced -Wdouble-promotion, so check for and disable
that on clang as we do on gcc.

The old style casts warning is already disabled globally in this file
for clang, so it doesn't need to be re-disabled within this scope.
 2017-09-14 10:28:18 +07:00
omar 54d30d758f Implicit "Debug" window uses a "Debug##Default" identifier to allow the user creating such window with custom flags 2017-09-12 13:16:27 +02:00
omar 65632d2682 Fixed alloca include for SunOS (#1319) 2017-09-12 11:55:13 +02:00
omar 3420080a35 Merge pull request #1319 from RyuKojiro/more_portable_alloca_include-ocornut 
Simplify alloca.h include condition (fix for NetBSD)
 2017-09-11 11:00:23 +02:00
Daniel Loffgren cf6ba9dd2d Don't do a bunch of OS gymnastics. alloca.h is only for glibc, everyone else uses stdlib.h 2017-09-11 00:15:43 -07:00