| 
							
							
								 omar | c09016b12a | Nav: Renamed ImGuiNavInput_PadLeft / etc. to ImGuiNavInput_PadLStickLeft. Renamed ImGuiNavInput_PadScrollLeft to ImGuiNavInput_PadRStickLeft, aka removing trying-too-hard semantic from the enums. (#787) | 2018-01-24 17:41:47 +01:00 |  | 
			
				
					| 
							
							
								 omar | bd278e958e | Nav: Added ImGuiNavInput_KeyLeft/Right/Up/Down set so we can differenciate gamepad/keyboard inputs. (#787) | 2018-01-24 17:41:47 +01:00 |  | 
			
				
					| 
							
							
								 ocornut | 680162eb32 | Merge branch 'master' into navigation | 2018-01-24 17:41:14 +01:00 |  | 
			
				
					| 
							
							
								 omar | 5148937d4d | Fixed old Begin() calling SetNextWindowBgAlpha() with negative values.  (#1567, #1568) | 2018-01-24 17:39:21 +01:00 |  | 
			
				
					| 
							
							
								 omar | 37ee99983f | Clear BgAlphaCond properly after consuming it. Fixes 9a76fd30fd(#1567) | 2018-01-24 15:09:02 +01:00 |  | 
			
				
					| 
							
							
								 omar | 823e1f0b94 | Nav: Reordered NavInput enums to match directional order of ImGuiDir_ and ImGuiKey_ + comments (#787) | 2018-01-24 10:43:57 +01:00 |  | 
			
				
					| 
							
							
								 omar | 64b786c2aa | Nav: Tweak/fixed popup positioning when using nav without the io.NavMovesMouse flag (it was always assuming a mouse cursor and allocating space for it) (#787) Note that this bit include badly hardcoded sizes, expecting an improvement later. | 2018-01-24 10:31:54 +01:00 |  | 
			
				
					| 
							
							
								 omar | cea78cc576 | Nav: Update hovered logic, so IsItemHovered and ButtonBehavior are more consistent with each other. The known case this fixes is nav focusing on a color button, tooltip appears, mouse move: previously tooltip would stay up. (#787) | 2018-01-24 10:24:41 +01:00 |  | 
			
				
					| 
							
							
								 omar | eb7ec781dc | Nav: Tweak GetNavInputAmount(). Split debug defines. | 2018-01-23 21:56:15 +01:00 |  | 
			
				
					| 
							
							
								 omar | f6ee8d30fb | Comments (#1567) | 2018-01-23 19:21:17 +01:00 |  | 
			
				
					| 
							
							
								 omar | d500113f1d | Merge branch 'master' into navigation # Conflicts:
#	imgui.cpp
#	imgui_demo.cpp | 2018-01-23 19:16:43 +01:00 |  | 
			
				
					| 
							
							
								 omar | 9a76fd30fd | Added SetNextWindowBgAlpha() helper. (#1567) particularly helpul with the marking of the old 5-parameters version of Begin() as obsolete. | 2018-01-23 19:13:49 +01:00 |  | 
			
				
					| 
							
							
								 omar | 2645ab5f7f | Comments + added legacy renamed GetItemsLineHeightWithSpacing() as stated in the doc, fixes 6190ab0084 | 2018-01-23 17:25:59 +01:00 |  | 
			
				
					| 
							
							
								 omar | 13c407591e | Nav: Comments, tweaks | 2018-01-23 16:45:46 +01:00 |  | 
			
				
					| 
							
							
								 omar | db2ba13154 | Internals: Exposed SetCurrentFont() in imgui_internal.h | 2018-01-23 16:33:06 +01:00 |  | 
			
				
					| 
							
							
								 omar | 9076366c17 | Style: Exposed ImGuiStyleVar_WindowTitleAlign, ImGuiStyleVar_ScrollbarSize, ImGuiStyleVar_ScrollbarRounding, ImGuiStyleVar_GrabRounding + added an assert to reduce accidental breakage. (#1181) | 2018-01-23 09:57:49 +01:00 |  | 
			
				
					| 
							
							
								 omar | 1acb155419 | Internals: Moved unnecessary MovingWindowMoveId field. | 2018-01-22 14:31:20 +01:00 |  | 
			
				
					| 
							
							
								 omar | 5097368bd5 | Tweaked FAQ. | 2018-01-22 12:01:24 +01:00 |  | 
			
				
					| 
							
							
								 omar | 9edf211c0e | Merge branch 'master' into navigation | 2018-01-21 20:46:50 +01:00 |  | 
			
				
					| 
							
							
								 omar | 3ed2ddbfbe | Metrics: Removed context size display. | 2018-01-21 20:32:05 +01:00 |  | 
			
				
					| 
							
							
								 omar | ac5b7a1bdf | Comments | 2018-01-21 20:10:23 +01:00 |  | 
			
				
					| 
							
							
								 omar | 8b64d50cc4 | Merge pull request #1564 from PanosK92/master Simplified return of ImGui::IsKeyReleased(). | 2018-01-21 17:20:44 +01:00 |  | 
			
				
					| 
							
							
								 Panos Karabelas | 7c8a19978d | Simplified return of ImGui::IsKeyReleased() | 2018-01-21 16:02:09 +00:00 |  | 
			
				
					| 
							
							
								 omar | 5eb293c879 | ImFontAtlas: Added TexUvScale (= 1.0f / (float)TexWidth, 1.0f / (float)TexHeight) | 2018-01-20 20:32:23 +01:00 |  | 
			
				
					| 
							
							
								 omar | cd1409f4bf | ImFontAtlas: Moved mouse cursor data out of ImGuiContext, fix drawing them with multiple context. Also remove the last remaining undesirable dependency on GImGui in imgui_draw.cpp, finishing the work recently done with ImDrawListSharedData. Hurra! (#939) | 2018-01-20 20:25:12 +01:00 |  | 
			
				
					| 
							
							
								 omar | 7e7c017b75 | Examples: Simplified mouse wheel handling. (#1463) | 2018-01-20 12:45:31 +01:00 |  | 
			
				
					| 
							
							
								 omar | 7dea158175 | Examples: Allegro, Apple, DirectX9/10/11, Glfw+Vulkan :Added support for horizontal mouse wheel. (#1463) | 2018-01-20 12:36:59 +01:00 |  | 
			
				
					| 
							
							
								 omar | 0b1fecb792 | Horizontal mouse wheel: renamed io.MouseHorizWheel to io.MouseWheelH. Reorganized the code in NewFrame(). Examples: Updated GLFW+GL and SDL+GL accordingly. (#1463) | 2018-01-20 12:36:16 +01:00 |  | 
			
				
					| 
							
							
								 omar | 6f6b6194b2 | Merge branch 'tseeker/20171127-feature-horiz-wheel' of https://github.com/tseeker/imgui into tseeker-tseeker/20171127-feature-horiz-wheel # Conflicts:
#	examples/sdl_opengl2_example/imgui_impl_sdl_gl2.cpp
#	examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp | 2018-01-20 12:06:06 +01:00 |  | 
			
				
					| 
							
							
								 omar | d4bf9b4686 | Renaming for consistency. | 2018-01-19 15:47:10 +01:00 |  | 
			
				
					| 
							
							
								 omar | 8877622fa8 | Merge branch 'master' into navigation # Conflicts:
#	imgui.cpp | 2018-01-19 15:42:28 +01:00 |  | 
			
				
					| 
							
							
								 omar | e5a6e85f6d | Basic undocumented/unsupported combination of Child+Tooltip. The full feature needs substancially more work but this is enough for simplest cases. (#1345) | 2018-01-19 15:37:25 +01:00 |  | 
			
				
					| 
							
							
								 omar | 42a612d7c9 | Begin: Removed asserts that got in the way of some flags combination. (#1345) | 2018-01-19 15:33:35 +01:00 |  | 
			
				
					| 
							
							
								 omar | 0978f00911 | MovingWindow: Track click offset based on root window (undo 514d30d8cd). This should not affect the patch used for #1345 as the RootWindow for Child+Tooltip window points to itself now. | 2018-01-19 15:14:53 +01:00 |  | 
			
				
					| 
							
							
								 omar | f3e510a9bf | Examples: SDL: Using SDL_CaptureMouse() to retrieve coordinates outside of client area when dragging. (#1559) Digging into sdl window/mouse stuff will also be useful for multi-viewport work. | 2018-01-19 10:46:54 +01:00 |  | 
			
				
					| 
							
							
								 omar | 00351ee2ab | Examples: SDL: Minor renaming. | 2018-01-19 09:55:49 +01:00 |  | 
			
				
					| 
							
							
								 omar | ba99900023 | Examples: GLFW+GL2: Renamed imgui_impl_glfw.* to imgui_impl_glfw_gl2.* for consistency and to emphasis on GL2-ness. | 2018-01-19 09:50:58 +01:00 |  | 
			
				
					| 
							
							
								 omar | 79dca9d5e6 | Examples: SDL+GL2: Renamed imgui_impl_sdl.* to imgui_impl_sdl_gl2.* for consistency and to emphasis on GL2-ness. | 2018-01-19 09:50:58 +01:00 |  | 
			
				
					| 
							
							
								 omar | 15fd5b6c4c | Examples: SDL: Minor renaming. | 2018-01-19 09:43:28 +01:00 |  | 
			
				
					| 
							
							
								 omar | ce17e0f274 | Examples: SDL: Using SDL_WINDOW_INPUT_FOCUS instead of SDL_WINDOW_MOUSE_FOCUS (which is ~~hovered). We should use SDL_CaptureMouse + SDL_WINDOW_MOUSE_CAPTURE_FLAG which requires SDL 2.0.4 will give it a try shortly. (#1559) | 2018-01-19 09:25:31 +01:00 |  | 
			
				
					| 
							
							
								 omar | 74dc70c543 | DragFloat: Fix/workaround for backends which do not preserve a valid mouse position when dragged out of bounds. (#1559) | 2018-01-19 09:16:26 +01:00 |  | 
			
				
					| 
							
							
								 omar | c2ffce3e5a | Drag and Drop: Fix comment. Removed IMGUI_PAYLOAD_TYPE_DOCKABLE from master branch. (#143) | 2018-01-18 17:39:40 +01:00 |  | 
			
				
					| 
							
							
								 omar | 63d47e8328 | Drag and Drop: Increased payload type string to 12 characters instead of 8.(#143) | 2018-01-18 17:32:34 +01:00 |  | 
			
				
					| 
							
							
								 omar | 932d3f0198 | NewFrame(): Added an assert to detect incorrect filling of the io.KeyMap[] array earlier. (#1555) + comments. | 2018-01-18 10:06:58 +01:00 |  | 
			
				
					| 
							
							
								 omar | 60d5dc7902 | Examples: SDL: Fixed mapping of Insert key (#1555, fix bug introduced in #1541) | 2018-01-18 10:01:36 +01:00 |  | 
			
				
					| 
							
							
								 omar | d1f726cd9d | Comments about Begin/End pair and handling of return value. | 2018-01-17 12:46:07 +01:00 |  | 
			
				
					| 
							
							
								 omar | cc15512bfc | InputText: Minor tweak. | 2018-01-17 12:15:24 +01:00 |  | 
			
				
					| 
							
							
								 omar | 7ccbb765e2 | InputText: Cursor X position not lost when clicking outside on an item that's submitted after the InputText(). It was only noticeable when restoring focus programmatically. (#1418, #1554) | 2018-01-17 12:15:00 +01:00 |  | 
			
				
					| 
							
							
								 omar | 2f15cc0855 | Nav: Fixed popup wrap-around logic for windows with scrolling. (#787) | 2018-01-15 21:55:32 +01:00 |  | 
			
				
					| 
							
							
								 omar | 05885b2e6d | Merge fix. | 2018-01-15 20:18:01 +01:00 |  |