mirror of
				https://github.com/ocornut/imgui.git
				synced 2025-11-04 01:34:32 +00:00 
			
		
		
		
	Merge branch 'examples_refactor2' into viewport (#1870)
# Conflicts: # examples/README.txt # examples/directx11_example/main.cpp # examples/directx12_example/main.cpp # examples/imgui_impl_dx10.cpp # examples/imgui_impl_dx11.cpp # examples/imgui_impl_dx12.cpp # examples/imgui_impl_glfw.cpp # examples/imgui_impl_opengl2.cpp # examples/imgui_impl_opengl2.h # examples/imgui_impl_opengl3.cpp # examples/imgui_impl_sdl2.cpp # examples/imgui_impl_sdl2.h # examples/imgui_impl_vulkan.cpp # examples/imgui_impl_vulkan.h # examples/imgui_impl_win32.cpp # examples/imgui_impl_win32.h # examples/opengl2_example/main.cpp # examples/opengl3_example/main.cpp # examples/sdl_opengl2_example/main.cpp # examples/sdl_opengl3_example/main.cpp # examples/sdl_vulkan_example/main.cpp # examples/vulkan_example/main.cpp # imgui.cpp # imgui.h
This commit is contained in:
		@@ -10,6 +10,7 @@
 | 
			
		||||
// CHANGELOG
 | 
			
		||||
// (minor and older changes stripped away, please see git history for details)
 | 
			
		||||
//  2018-XX-XX: Platform: Added support for multiple windows via the ImGuiPlatformIO interface.
 | 
			
		||||
//  2018-06-08: Misc: Extracted imgui_impl_win32.cpp/.h away from the old combined DX9/DX10/DX11/DX12 examples.
 | 
			
		||||
//  2018-03-20: Misc: Setup io.BackendFlags ImGuiBackendFlags_HasMouseCursors and ImGuiBackendFlags_HasSetMousePos flags + honor ImGuiConfigFlags_NoMouseCursorChange flag.
 | 
			
		||||
//  2018-02-20: Inputs: Added support for mouse cursors (ImGui::GetMouseCursor() value and WM_SETCURSOR message handling).
 | 
			
		||||
//  2018-02-06: Inputs: Added mapping for ImGuiKey_Space.
 | 
			
		||||
@@ -129,8 +130,6 @@ static bool ImGui_ImplWin32_UpdateMouseCursor()
 | 
			
		||||
//                                 io.MousePos is (0,0) when the mouse is on the upper-left of the primary monitor.
 | 
			
		||||
//   - io.MousePosViewport ....... viewport which mouse position is based from (generally the focused/active/capturing viewport)
 | 
			
		||||
//   - io.MouseHoveredViewport ... [optional] viewport which mouse is hovering, with _very_ specific/strict conditions (Read comments next to io.MouseHoveredViewport. This is _NOT_ easy to provide in many high-level engine because of how we handle the ImGuiViewportFlags_NoInputs flag)
 | 
			
		||||
// This function overwrite the value of io.MousePos normally updated by the WM_MOUSEMOVE handler. 
 | 
			
		||||
// We keep the WM_MOUSEMOVE handling code so that WndProc function can be copied as-in in applications which do not need multi-viewport support.
 | 
			
		||||
static void ImGui_ImplWin32_UpdateMousePos()
 | 
			
		||||
{
 | 
			
		||||
    ImGuiIO& io = ImGui::GetIO();
 | 
			
		||||
@@ -257,10 +256,6 @@ IMGUI_API LRESULT ImGui_ImplWin32_WndProcHandler(HWND hwnd, UINT msg, WPARAM wPa
 | 
			
		||||
    case WM_MOUSEHWHEEL:
 | 
			
		||||
        io.MouseWheelH += GET_WHEEL_DELTA_WPARAM(wParam) > 0 ? +1.0f : -1.0f;
 | 
			
		||||
        return 0;
 | 
			
		||||
    case WM_MOUSEMOVE:
 | 
			
		||||
        io.MousePos.x = (signed short)(lParam);                 // Note: this is used for single-viewport support, but in reality the code in ImGui_ImplWin32_UpdateMousePos() overwrite this.
 | 
			
		||||
        io.MousePos.y = (signed short)(lParam >> 16);
 | 
			
		||||
        return 0;
 | 
			
		||||
    case WM_KEYDOWN:
 | 
			
		||||
    case WM_SYSKEYDOWN:
 | 
			
		||||
        if (wParam < 256)
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user