Benj
/
imgui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,322 Commits
1 Branch
0 Tags
81 MiB
docking
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'be12f8c55d'
${ noResults }
Commit Graph

3322 Commits (be12f8c55d1e83c8ae2cf8cb69dda750503abbc2)
 

Author SHA1 Message Date
omar b409d399c8 Demo: style editor output tweak so it is easier to modify the output code.. + TODO list update 7 years ago
omar 9693fd5351 PushStyleVar/PopStyleVar: internal tweaks 7 years ago
omar 7c9e38f60a Style: Moving code in a function to make incoming diff easier to parse. 7 years ago
omar 709653c330 Merge branch 'master' into styles 7 years ago
omar 6c91a1ef7f Minor comments 7 years ago
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.
 7 years ago
omar c4c042bcec Typo 7 years ago
omar 052999a6ab More consistently uses "Dear ImGui" 7 years ago
omar 83645aa593 More consistently uses "Dear ImGui" 7 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.
 7 years ago
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.
 7 years ago
omar 54d30d758f Implicit "Debug" window uses a "Debug##Default" identifier to allow the user creating such window with custom flags 7 years ago
omar 65632d2682 Fixed alloca include for SunOS (#1319) 7 years ago
omar 3420080a35 Merge pull request #1319 from RyuKojiro/more_portable_alloca_include-ocornut 
Simplify alloca.h include condition (fix for NetBSD)
 7 years ago
Daniel Loffgren cf6ba9dd2d Don't do a bunch of OS gymnastics. alloca.h is only for glibc, everyone else uses stdlib.h 7 years ago
omar 66a9d4856c Merge branch 'master' into navigation 
# Conflicts:
#	imgui_internal.h
 7 years ago
omar cb2775ae54 Internals: ImGuiItemFlags comments 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 51fcef0c21 BeginCombo() tweaks, merged from Navigation branch. 7 years ago
omar 38ed66f55e Merge branch 'master' into navigation 
# Conflicts:
#	imgui_demo.cpp
 7 years ago
omar 9e2f202f05 Demo: Not using the undesirable Begin() overload. 7 years ago
omar 5c4fda0fbc Merge branch 'master' into navigation 
# Conflicts:
#	imgui.cpp
#	imgui_internal.h
 7 years ago
omar 2169bf6895 Fixed WantTextInput from being true when an activated Drag or Slider was previously turned into an InputText(). (#1317) 7 years ago
omar 790605e359 Minor comments + renaming internal fields 7 years ago
omar 8971d70149 Merge pull request #1313 from thevaber/master 
Improved ColorPicker hue wheel color interpolation
 7 years ago
Václav Patejdl e1a7aa41cb Improved ColorPicker hue wheel color interpolation 7 years ago
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. 7 years ago
omar 6400f2900a Begin(): renamed locals. 7 years ago
omar a9c6a0f6ec Begin(): Removed unnecessary code (at the time of 1.18 commit e9e0e36f98, CursorPos was used to compute SizeContentsFit and this was necessary) 7 years ago
omar 89cae37b49 Begin(): Tidying up some code, should be a no-op. 7 years ago
omar 8fbe8709f9 TODO, minor tweak 7 years ago
omar e8dbf1c795 Combo: Internally split into BeginCombo(), EndCombo(), toward a more flexible combo api. 7 years ago
omar 5658675e9d Combo: Removed unnecessary ClearActiveId() call (from era where active combo stored an id, now we just use popup functionality) 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 b8ade0b94f Examples: Main: Removed call to SetNextWindowSize() 7 years ago
omar 4abce8af58 Examples: GL2: Renaming, comments. 7 years ago
omar 5665f1d3e3 Merge branch 'nlguillemot-master' 7 years ago
omar d9016964ad Examples: GL3: Comments, tweaks (#1145) 7 years ago
omar c47e5fc76a Merge branch 'master' of https://github.com/nlguillemot/imgui into nlguillemot-master 7 years ago
omar 7d1f2c0dc5 Examples: GL2: rename functions to include GL2 in name 7 years ago
omar d165817880 Merge pull request #1307 from JJscott/dev 
Examples: OpenGL: Backup polygon mode, draw with filled polygons, restore state, for clients running opengl with glPolygonMode. closes #798
 7 years ago
unknown cf48e28932 Backup polygon mode, draw with filled polygons, restore state, for clients running opengl with glPolygonMode. closes #798 7 years ago
Branimir Karadžić 670d40642f Fixed C4267 conversion from size_t to int. 7 years ago
omar 6a1ba317c7 Demo: Minor coding style tweaks so bgfx copy needs less patching. 7 years ago
omar 1a62d46db5 Merge branch 'master' into navigation 
# Conflicts:
#	imgui.cpp
 7 years ago
omar 97a40e74fb Nav: Fixed bad merge of 6def01be5d so the bug fixed in #840 wasn't fully fixed in Nav branch. 7 years ago
omar 96d2942373 InputText: Merged bits from Navigation branch (inc. g.ActiveIdIsJustActivated is only set on the toggle). 7 years ago
omar 9a0171b803 Merge branch 'master' into navigation 
# Conflicts:
#	imgui.cpp
 7 years ago