omar 
							
						 
					 
					
						
						
							
						
						7f6a025c93 
					 
					
						
						
							
							Viewport: SDL: Inherit SDL_WINDOW_ALLOW_HIGHDPI flag from main viewport. ( #2306 )  
						
						
						
						
					 
					
						2019-02-11 19:00:33 +01:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						2cada3c143 
					 
					
						
						
							
							Merge branch 'master' into docking  
						
						... 
						
						
						
						# Conflicts:
#	examples/imgui_impl_opengl2.cpp
#	examples/imgui_impl_opengl3.cpp
#	imgui.cpp
#	imgui_widgets.cpp 
						
						
					 
					
						2019-02-11 18:59:49 +01:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						d16dbc5b87 
					 
					
						
						
							
							Examples: SDL: Using the SDL_WINDOW_ALLOW_HIGHDPI flag. ( #2306 ,  #1676 ) [@rasky]  
						
						
						
						
					 
					
						2019-02-11 18:52:08 +01:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						a79785c0b9 
					 
					
						
						
							
							ImDrawData: Added FramebufferScale field (currently a copy of the value from io.DisplayFramebufferScale).  
						
						... 
						
						
						
						This is to allow render functions being written without pulling any data from ImGuiIO, allowing incoming multi-viewport feature to behave on Retina display and with multiple displays. If you are not using a custom binding, please update your render function code ahead of time, and use draw_data->FramebufferScale instead of io.DisplayFramebufferScale. (#2306 , #1676 )
Examples: Metal, OpenGL2, OpenGL3: Fixed offsetting of clipping rectangle with ImDrawData::DisplayPos != (0,0) when the display frame-buffer scale scale is not (1,1). While this doesn't make a difference when using master branch, this is effectively fixing support for multi-viewport with Mac Retina Displays on those examples. (#2306 ) Also using ImDrawData::FramebufferScale instead of io.DisplayFramebufferScale.
Examples: Clarified the use the ImDrawData::DisplayPos to offset clipping rectangles. 
						
						
					 
					
						2019-02-11 18:52:08 +01:00 
						 
				 
			
				
					
						
							
							
								Omar Cornut 
							
						 
					 
					
						
						
							
						
						ef7940699e 
					 
					
						
						
							
							Examples: Metal: Removed unnecessary loop. Fixed OSX Clang warning in imstb_truetype. ( #1929 ,  #1873 )  
						
						
						
						
					 
					
						2019-02-11 17:38:34 +01:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						4b41d3b280 
					 
					
						
						
							
							ImFont: Rearranged members toward an optimal CalcTextSize() loop. Removed comments from destructor. Made constructor more explicit.  
						
						
						
						
					 
					
						2019-02-09 15:54:47 +01:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						539f69b950 
					 
					
						
						
							
							Updated STB libraries to latest (drift has been reduced with nothings/stb as most of our changes were merged). Using [DEAR IMGUI] markers when changed.  
						
						
						
						
					 
					
						2019-02-08 15:24:59 +01:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						00c637961b 
					 
					
						
						
							
							Demo: Font selector allow selecting fonts with same debug name. ( #2332 )  
						
						
						
						
					 
					
						2019-02-08 14:59:09 +01:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						afc36cf802 
					 
					
						
						
							
							Window: Fixed initial width of collapsed windows not taking account of contents width (broken in 1.67). ( #2336 ,  #176 )  
						
						
						
						
					 
					
						2019-02-08 14:34:42 +01:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						1b63ded8fa 
					 
					
						
						
							
							Tabs: Fixed border (when enabled) so it is aligned correctly mid-pixel and appears as bright as other borders.  
						
						
						
						
					 
					
						2019-02-07 12:07:53 +01:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						4a3a895be9 
					 
					
						
						
							
							Merge branch 'master' into docking  
						
						... 
						
						
						
						# Conflicts:
#	imgui.cpp
#	imgui_demo.cpp 
						
						
					 
					
						2019-02-06 14:47:53 +01:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						29d38b59d0 
					 
					
						
						
							
							ListBox/InputTextMultiline: Better optimized when clipped / non-visible.  
						
						
						
						
					 
					
						2019-02-06 14:46:14 +01:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						62084aac0f 
					 
					
						
						
							
							DragScalarN, SliderScalarN, InputScalarN: Removed unnecessary string id after the integer PushID() calls.  
						
						
						
						
					 
					
						2019-02-06 14:39:00 +01:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						f366828dd2 
					 
					
						
						
							
							Minor tweaks to reduce false positive of PVS Studio static analyzer.  
						
						
						
						
					 
					
						2019-02-06 13:16:52 +01:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						5bdc7d7a6f 
					 
					
						
						
							
							Menus: Tweaked horizontal overlap between parent and child menu (to help convey relative depth) from using style.ItemSpacing.x to style.ItemInnerSpacing.x, the later being expected to be smaller. ( #1086 )  
						
						
						
						
					 
					
						2019-02-06 12:32:10 +01:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						e3dd95d335 
					 
					
						
						
							
							Added IsItemActivated() as an extension to the IsItemDeactivated/IsItemDeactivatedAfterEdit functions which are useful to implement variety of undo patterns. ( #820 ,  #956 ,  #1875 )  
						
						
						
						
					 
					
						2019-02-06 11:52:42 +01:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						c59611a3b3 
					 
					
						
						
							
							InputText: Fixed redo buffer exhaustion handling (rare) which could corrupt the undo character buffer. ( #2333 )  
						
						
						
						
					 
					
						2019-02-05 23:38:57 +01:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						97ed97b8ce 
					 
					
						
						
							
							Plot: Register an ID to take the click the same way as other framed widgets. Set HoveredId in the FramePadding zone (between inner_bb and frame_bb).  
						
						
						
						
					 
					
						2019-02-05 21:17:04 +01:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						cef4e086ba 
					 
					
						
						
							
							Internals: Selectable: Fixed rendering width miscalculation when starting pos is not line start pos, which would generally be unnoticeable. Could affect group lock X with a smaller SetCursorPos value but that's unlikely to be used.  
						
						
						
						
					 
					
						2019-02-05 21:17:00 +01:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						b8c24aff4c 
					 
					
						
						
							
							Internals: EndGroup: Removed unnecesary parameter to ItemSize()  
						
						
						
						
					 
					
						2019-02-05 21:16:54 +01:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						521470b3cd 
					 
					
						
						
							
							Internals: Removed unnecessary code.  
						
						
						
						
					 
					
						2019-02-05 21:16:32 +01:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						f6fbb99a9c 
					 
					
						
						
							
							Examples: SDL: Fix for Emscripten/Android/iOS on Docking branch.  
						
						
						
						
					 
					
						2019-02-05 15:45:26 +01:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						5a95c77388 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/ocornut/imgui  
						
						
						
						
					 
					
						2019-02-05 13:53:09 +01:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						be107ba8f8 
					 
					
						
						
							
							Merge branch 'master' into docking  
						
						... 
						
						
						
						# Conflicts:
#	imgui_internal.h
#	imgui_widgets.cpp 
						
						
					 
					
						2019-02-05 13:52:32 +01:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						b980e0077a 
					 
					
						
						
							
							Tabs: Moved Tab List Popup to left-side to match docking button. Highlight selected tab. ( #261 ,  #351 )  
						
						
						
						
					 
					
						2019-02-05 13:39:48 +01:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						d38f4dc143 
					 
					
						
						
							
							Tabs: Non-docking tab bars are storing names to allow tab list button + whole style scaling. Added ImGuiTabBarFlags_TabListPopupButton flag to show a popup button on manual tab bars. Locking FramePadding for the scope of a tab-bar to avoid sheering/clipping of tab item. Made scaling of tab ellipsis less awkward. ( #261 ,  #351 )  
						
						
						
						
					 
					
						2019-02-05 13:23:44 +01:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						d93e3c17fc 
					 
					
						
						
							
							ImGuiTextBuffer: Fix size() to allow using ImGuiTextBuffer with resize(0) patterns.  
						
						
						
						
					 
					
						2019-02-05 13:16:23 +01:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						65c972e9e4 
					 
					
						
						
							
							Update README.md  
						
						
						
						
					 
					
						2019-02-05 11:45:19 +01:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						f7c879eb60 
					 
					
						
						
							
							RadioButton: Fixed label horizontal alignment to precisely match Checkbox(). + Internals: Checkbox, RadioButton: Single call to ItemSize() for flow layout purpose.  
						
						
						
						
					 
					
						2019-02-04 23:34:32 +01:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						0b05ba18df 
					 
					
						
						
							
							Internals: DragScalar, SliderScalar: Calling ItemSize before ItemAdd as with every other widgets so we can more easily rearrange the signature of ItemXXX functions (toward allowing non-rounded sizes for scaling and flow layout).  
						
						
						
						
					 
					
						2019-02-04 23:34:27 +01:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						8e44aacc8e 
					 
					
						
						
							
							Fonts: Fixed crash if FontGlobalScale is zero. Correctly debug naming default font if not 13 px. Demo: Moved PopupRounding along with other rounding values. Metrics: Displaying indexes with idx to be correct / less misleading.  
						
						
						
						
					 
					
						2019-02-04 23:34:20 +01:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						f902435a53 
					 
					
						
						
							
							Docking: Fixed less of node size/pos caused by  1f2bdd37 ( #2109 )  
						
						
						
						
					 
					
						2019-02-03 18:58:07 +01:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						80d51c692a 
					 
					
						
						
							
							Docking: Fixed dragging docked window with _NoMove flag ( #2325 )  
						
						
						
						
					 
					
						2019-02-03 18:44:30 +01:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						7227454dca 
					 
					
						
						
							
							Merge branch 'master' into docking  
						
						... 
						
						
						
						# Conflicts:
#	examples/imgui_impl_opengl3.cpp
#	imgui.cpp
#	imgui.h 
						
						
					 
					
						2019-02-03 17:31:16 +01:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						c23a19c26f 
					 
					
						
						
							
							Internals: Exposed internal SetWindowPos to imgui_internal.h (for imgui-test)  
						
						
						
						
					 
					
						2019-02-03 17:29:51 +01:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						f087359621 
					 
					
						
						
							
							Revert part of change from  5536eded. Fixed drag and drop in docking branch. ( #2331 , reopening  #2325 )  
						
						
						
						
					 
					
						2019-02-03 13:54:04 +01:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						e215809c4d 
					 
					
						
						
							
							Removed io.DisplayVisibleMin/DisplayVisibleMax (which were marked obsolete and removed from viewport/docking branch already).  
						
						
						
						
					 
					
						2019-02-01 17:06:40 +01:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						ac6d474103 
					 
					
						
						
							
							Removed io.DisplayVisibleMin/DisplayVisibleMax (which were marked obsolete and removed from viewport/docking branch already).  
						
						
						
						
					 
					
						2019-02-01 16:37:07 +01:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						03b0266b59 
					 
					
						
						
							
							Examples: Made imgui_impl_win32 drag gdi32.lib for GetDeviceCaps(). ( #2327 )  
						
						
						
						
					 
					
						2019-02-01 15:23:25 +01:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						5fc6899dc2 
					 
					
						
						
							
							Examples: OpenGL3: Using GLSL 4.10 shaders for any GLSL version over 410 (e.g. 430, 450). ( #2329 ) [@BrutPitt]  
						
						
						
						
					 
					
						2019-02-01 15:13:54 +01:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						d1c45c0d76 
					 
					
						
						
							
							Merge branch 'master' into docking (enable range_select merge)  
						
						... 
						
						
						
						# Conflicts:
#	imgui.cpp
#	imgui_internal.h 
						
						
					 
					
						2019-02-01 12:25:49 +01:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						5cb7040f66 
					 
					
						
						
							
							Internals: Tracking dummy select scope id (currently always zero) to facilitate merging of the range_select branch. ( #1861 )  
						
						
						
						
					 
					
						2019-02-01 12:14:38 +01:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						d5945aa25b 
					 
					
						
						
							
							Internals: Minor changes to TreeNodeBehavior() and Selectable() for the benefit of fhe range_select branch. ( #1861 )  
						
						
						
						
					 
					
						2019-02-01 12:14:38 +01:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						0d4a2a2cd0 
					 
					
						
						
							
							Internals: Track ActiveIdHasBeenPressed (similar to ActiveIdHasBeenEdited). This is currently mostly for the benefit of the range_select branch. ( #1861 )  
						
						
						
						
					 
					
						2019-02-01 12:14:37 +01:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						e30babef09 
					 
					
						
						
							
							Fixed Clang/Win32 warning.  
						
						
						
						
					 
					
						2019-02-01 11:22:53 +01:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						a608156da3 
					 
					
						
						
							
							Merge branch 'master' into docking  
						
						... 
						
						
						
						# Conflicts:
#	imgui.cpp
#	imgui.h
#	imgui_internal.h 
						
						
					 
					
						2019-02-01 11:19:26 +01:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						65a2350a5f 
					 
					
						
						
							
							Docking: Extracted code into a DocknodeUpdateTabListMenu() functions + minor other changes.  
						
						
						
						
					 
					
						2019-02-01 11:12:37 +01:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						cbf24a9151 
					 
					
						
						
							
							Comments. Fix duplicate entries in About box. Synchronize a few small changes from Master branch.  
						
						
						
						
					 
					
						2019-02-01 11:04:04 +01:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						52a9f8bd3e 
					 
					
						
						
							
							Merged from Docking branch: Various small changes, comments, typos fixes, moved blocks. To reduce overall drift. Should be no-op.  
						
						
						
						
					 
					
						2019-02-01 10:26:08 +01:00 
						 
				 
			
				
					
						
							
							
								omar 
							
						 
					 
					
						
						
							
						
						699e945a82 
					 
					
						
						
							
							Merged from Docking branch: non-const ImVec2[] operator.  
						
						
						
						
					 
					
						2019-02-01 10:22:46 +01:00