7e8069dd23
Merge branch 'master' into navigation
2017-09-25 22:08:38 +02:00
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
4b2781fe87
Begin: Moving some code into a CalcSizeAutoFit() function.
2017-09-25 21:57:42 +02:00
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
a34edb810e
Demo: Fixed overlay demo keeps resizing (in case, e.g.: font changes)
2017-09-25 21:12:07 +02:00
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
0a55573288
Begin(): Minor tidying up of flow
2017-09-25 15:48:52 +02:00
9f34925b2a
Window: Tweaked ApplySizeFullWithConstraint() -> CalcSizeFullWithConstraint() so it can be used without side-effect
2017-09-25 13:23:25 +02:00
0a5fb24f10
Popups: Exposing a little more of popups internals in imgui_internals.h
2017-09-25 12:52:06 +02:00
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
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
113b2467cd
Minor bits. Reduce usage of GImGui multiple times in same function.
2017-09-20 23:02:06 +02:00
229921541b
TODO list
2017-09-20 18:54:36 +02:00
9b2672a99f
Update README.md
2017-09-19 18:33:04 +02:00
2fc07c1b7d
Update README.md
2017-09-19 18:32:09 +02:00
ba12d37719
Merge pull request #1324 from waywardmonkeys/improve-clang-warnings
...
FIxes zealous Clang warning.
2017-09-19 18:18:53 +02:00
479e532f18
ColorEdit: fixed weird ternary pattern that makes some compiler warning (fair)
2017-09-18 21:41:49 +02:00
92e55a8a79
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.h
2017-09-18 16:06:48 +02:00
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
1ff27d7db8
Added io.WantMoveMouse flags from Nav branch so Examples/Binding can already implement it. ( #787 )
2017-09-18 16:04:28 +02:00
f24b5f71ca
Merge branch 'master' into navigation
2017-09-18 15:35:47 +02:00
79ce9b74d5
BeginTooltipEx() internal tweaks
2017-09-18 15:35:00 +02:00
44e8d94aba
Merge branch 'master' into navigation
2017-09-18 15:32:31 +02:00
105f3b14e4
Merge branch 'master' into styles
2017-09-18 15:11:51 +02:00
564c97b87e
Comments
2017-09-18 15:11:22 +02:00
f0f86213db
ImVector: added resize() variant with initialization value
2017-09-18 15:11:05 +02:00
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
9693fd5351
PushStyleVar/PopStyleVar: internal tweaks
2017-09-18 15:07:22 +02:00
7c9e38f60a
Style: Moving code in a function to make incoming diff easier to parse.
2017-09-18 15:06:54 +02:00
709653c330
Merge branch 'master' into styles
2017-09-18 15:03:25 +02:00
6c91a1ef7f
Minor comments
2017-09-17 23:35:39 +02:00
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
c4c042bcec
Typo
2017-09-15 01:32:29 +02:00
052999a6ab
More consistently uses "Dear ImGui"
2017-09-15 01:31:41 +02:00
83645aa593
More consistently uses "Dear ImGui"
2017-09-15 01:28:30 +02:00
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
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
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
65632d2682
Fixed alloca include for SunOS ( #1319 )
2017-09-12 11:55:13 +02:00
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
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
66a9d4856c
Merge branch 'master' into navigation
...
# Conflicts:
# imgui_internal.h
2017-09-06 20:37:29 +02:00
cb2775ae54
Internals: ImGuiItemFlags comments
2017-09-06 20:36:36 +02:00
62d7fa4324
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
2017-09-06 20:33:39 +02:00
f63c03c464
Internals: moved ButtonRepeat and AllowKeyboardFocus bools/stacks to a generic ItemFlags stack. Merged from Navigation branch.
2017-09-06 20:28:36 +02:00
51fcef0c21
BeginCombo() tweaks, merged from Navigation branch.
2017-09-06 19:31:50 +02:00
38ed66f55e
Merge branch 'master' into navigation
...
# Conflicts:
# imgui_demo.cpp
2017-09-06 19:25:07 +02:00
9e2f202f05
Demo: Not using the undesirable Begin() overload.
2017-09-06 19:24:08 +02:00
5c4fda0fbc
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
2017-09-06 19:17:51 +02:00
2169bf6895
Fixed WantTextInput from being true when an activated Drag or Slider was previously turned into an InputText(). ( #1317 )
2017-09-06 17:25:36 +02:00
