moonpower/imgui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,074 Commits 4 Branches 0 Tags
44e8d94abaaa04248b90ffe10f6f09ecf0637dee
Commit Graph
3074 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
omarandGitHub 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
omarandGitHub 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
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
omarandGitHub 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
omar 66a9d4856c Merge branch 'master' into navigation 
# Conflicts:
#	imgui_internal.h
 2017-09-06 20:37:29 +02:00
omar cb2775ae54 Internals: ImGuiItemFlags comments 2017-09-06 20:36:36 +02:00
omar 62d7fa4324 Merge branch 'master' into navigation 
# Conflicts:
#	imgui.cpp
#	imgui_internal.h
 2017-09-06 20:33:39 +02:00
omar 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
omar 51fcef0c21 BeginCombo() tweaks, merged from Navigation branch. 2017-09-06 19:31:50 +02:00
omar 38ed66f55e Merge branch 'master' into navigation 
# Conflicts:
#	imgui_demo.cpp
 2017-09-06 19:25:07 +02:00
omar 9e2f202f05 Demo: Not using the undesirable Begin() overload. 2017-09-06 19:24:08 +02:00
omar 5c4fda0fbc Merge branch 'master' into navigation 
# Conflicts:
#	imgui.cpp
#	imgui_internal.h
 2017-09-06 19:17:51 +02:00
omar 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
omar 790605e359 Minor comments + renaming internal fields 2017-09-06 17:20:54 +02:00
omarandGitHub 8971d70149 Merge pull request #1313 from thevaber/master 
Improved ColorPicker hue wheel color interpolation
 2017-09-05 18:35:08 +02:00
Václav Patejdl e1a7aa41cb Improved ColorPicker hue wheel color interpolation 2017-09-05 16:31:54 +02:00
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. 2017-09-04 13:29:57 +02:00
omar 6400f2900a Begin(): renamed locals. 2017-09-04 13:26:46 +02:00
omar a9c6a0f6ec Begin(): Removed unnecessary code (at the time of 1.18 commit e9e0e36f98, CursorPos was used to compute SizeContentsFit and this was necessary) 2017-09-04 13:24:45 +02:00
omar 89cae37b49 Begin(): Tidying up some code, should be a no-op. 2017-09-04 13:05:20 +02:00
omar 8fbe8709f9 TODO, minor tweak 2017-09-04 13:03:04 +02:00
omar e8dbf1c795 Combo: Internally split into BeginCombo(), EndCombo(), toward a more flexible combo api. 2017-09-01 22:10:13 +02:00
omar 5658675e9d Combo: Removed unnecessary ClearActiveId() call (from era where active combo stored an id, now we just use popup functionality) 2017-09-01 21:58:58 +02:00
omar 804ee78731 Added IsWindowAppearing(). 2017-09-01 21:55:59 +02:00
omar fd684ba974 Removed 2 obsolete redirection functions (obsoleted 26+ months ago). 2017-09-01 17:43:56 +02:00
omar b8ade0b94f Examples: Main: Removed call to SetNextWindowSize() 2017-09-01 17:07:19 +02:00
omar 4abce8af58 Examples: GL2: Renaming, comments. 2017-09-01 17:07:19 +02:00
omar 5665f1d3e3 Merge branch 'nlguillemot-master' 2017-09-01 16:55:36 +02:00
omar d9016964ad Examples: GL3: Comments, tweaks (#1145) 2017-09-01 16:55:04 +02:00
omar c47e5fc76a Merge branch 'master' of https://github.com/nlguillemot/imgui into nlguillemot-master 2017-09-01 16:49:36 +02:00
omar 7d1f2c0dc5 Examples: GL2: rename functions to include GL2 in name 2017-09-01 16:45:31 +02:00
omarandGitHub 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
 2017-09-01 22:30:14 +08:00
unknown cf48e28932 Backup polygon mode, draw with filled polygons, restore state, for clients running opengl with glPolygonMode. closes #798 2017-09-01 20:39:12 +12:00
Branimir Karadžićandomar 670d40642f Fixed C4267 conversion from size_t to int. 2017-09-01 14:42:49 +08:00
omar 6a1ba317c7 Demo: Minor coding style tweaks so bgfx copy needs less patching. 2017-08-29 19:05:56 +08:00
omar 1a62d46db5 Merge branch 'master' into navigation 
# Conflicts:
#	imgui.cpp
 2017-08-29 18:47:23 +08:00