Commit Graph

6627 Commits (13cdf2ff0e554d2097841e742a26180440c69173)
 

Author SHA1 Message Date
omar 105f3b14e4 Merge branch 'master' into styles
omar 564c97b87e Comments
omar f0f86213db ImVector: added resize() variant with initialization value
omar b409d399c8 Demo: style editor output tweak so it is easier to modify the output code.. + TODO list update
omar 9693fd5351 PushStyleVar/PopStyleVar: internal tweaks
omar 7c9e38f60a Style: Moving code in a function to make incoming diff easier to parse.
omar 709653c330 Merge branch 'master' into styles
omar 6c91a1ef7f Minor comments
omar 2aa9a538c0 Merge pull request from waywardmonkeys/remove-commas-at-end-of-list
Remove commas after last item in enumeration to stay compatible with older compilers.
omar c4c042bcec Typo
omar 052999a6ab More consistently uses "Dear ImGui"
omar 83645aa593 More consistently uses "Dear ImGui"
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.
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.
omar 54d30d758f Implicit "Debug" window uses a "Debug##Default" identifier to allow the user creating such window with custom flags
omar 65632d2682 Fixed alloca include for SunOS ()
omar 3420080a35 Merge pull request from RyuKojiro/more_portable_alloca_include-ocornut
Simplify alloca.h include condition (fix for NetBSD)
Daniel Loffgren cf6ba9dd2d Don't do a bunch of OS gymnastics. alloca.h is only for glibc, everyone else uses stdlib.h
omar 66a9d4856c Merge branch 'master' into navigation
# Conflicts:
#	imgui_internal.h
omar cb2775ae54 Internals: ImGuiItemFlags comments
omar 62d7fa4324 Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
#	imgui_internal.h
omar f63c03c464 Internals: moved ButtonRepeat and AllowKeyboardFocus bools/stacks to a generic ItemFlags stack. Merged from Navigation branch.
omar 51fcef0c21 BeginCombo() tweaks, merged from Navigation branch.
omar 38ed66f55e Merge branch 'master' into navigation
# Conflicts:
#	imgui_demo.cpp
omar 9e2f202f05 Demo: Not using the undesirable Begin() overload.
omar 5c4fda0fbc Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
#	imgui_internal.h
omar 2169bf6895 Fixed WantTextInput from being true when an activated Drag or Slider was previously turned into an InputText(). ()
omar 790605e359 Minor comments + renaming internal fields
omar 8971d70149 Merge pull request from thevaber/master
Improved ColorPicker hue wheel color interpolation
Václav Patejdl e1a7aa41cb Improved ColorPicker hue wheel color interpolation
omar 2600b28f5d Begin(): fixed calling Begin() more than once per frame setting `window_just_activated_by_user` which in turn would set Appearing to true for that frame.
omar 6400f2900a Begin(): renamed locals.
omar a9c6a0f6ec Begin(): Removed unnecessary code (at the time of 1.18 commit e9e0e36f98, CursorPos was used to compute SizeContentsFit and this was necessary)
omar 89cae37b49 Begin(): Tidying up some code, should be a no-op.
omar 8fbe8709f9 TODO, minor tweak
omar e8dbf1c795 Combo: Internally split into BeginCombo(), EndCombo(), toward a more flexible combo api.
omar 5658675e9d Combo: Removed unnecessary ClearActiveId() call (from era where active combo stored an id, now we just use popup functionality)
omar 804ee78731 Added IsWindowAppearing().
omar fd684ba974 Removed 2 obsolete redirection functions (obsoleted 26+ months ago).
omar b8ade0b94f Examples: Main: Removed call to SetNextWindowSize()
omar 4abce8af58 Examples: GL2: Renaming, comments.
omar 5665f1d3e3 Merge branch 'nlguillemot-master'
omar d9016964ad Examples: GL3: Comments, tweaks ()
omar c47e5fc76a Merge branch 'master' of https://github.com/nlguillemot/imgui into nlguillemot-master
omar 7d1f2c0dc5 Examples: GL2: rename functions to include GL2 in name
omar d165817880 Merge pull request from JJscott/dev
Examples: OpenGL: Backup polygon mode, draw with filled polygons, restore state, for clients running opengl with glPolygonMode. closes 
unknown cf48e28932 Backup polygon mode, draw with filled polygons, restore state, for clients running opengl with glPolygonMode. closes
Branimir Karadžić 670d40642f Fixed C4267 conversion from size_t to int.
omar 6a1ba317c7 Demo: Minor coding style tweaks so bgfx copy needs less patching.
omar 1a62d46db5 Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp