Merge branch 'master' into docking

# Conflicts:
#	examples/example_apple_opengl2/main.mm

docs/CHANGELOG.txt

@@ -64,9 +64,12 @@ Other Changes:
   - QNX: added QNX Screen backend. (#9492) [@mgorchak-blackberry]
   - SDL2: fixed querying framebuffer scale/density when using Metal without
     going through a SDL_Renderer. (#5592) [@lailoken]
+  - WebGPU: fixed passing non-integer sizes to `wgpuRenderPassEncoderSetViewport()`
+    when when `FramebufferScale` is >1.0f. (#9515, #8628) [@WayU]
 - Examples:
   - SDL2+Metal: create Metal context without using a SDL_Renderer.
   - QNX+OpenGL3, QNX+Vulkan: added QNX Screen examples. (#9492) [@mgorchak-blackberry]
+  - OSX+OpenGL3: added example_apple_opengl3/ (OSX/Cocoa + OpenGL 3.2 Core profile).
 
 Docking+Viewports Branch:
 

docs/EXAMPLES.md

@@ -70,8 +70,10 @@ OSX & iOS + Metal4 example, Mac only. <BR>
 [example_apple_opengl2/](https://github.com/ocornut/imgui/blob/master/examples/example_apple_opengl2/) <BR>
 OSX + OpenGL2 example. <BR>
 = main.mm + imgui_impl_osx.mm + imgui_impl_opengl2.cpp <BR>
-(NB: imgui_impl_osx.mm is currently not as feature complete as other platforms backends.
- You may prefer to use the GLFW Or SDL backends, which will also support Windows and Linux.)
+
+[example_apple_opengl3/](https://github.com/ocornut/imgui/blob/master/examples/example_apple_opengl3/) <BR>
+OSX + OpenGL3 example. <BR>
+= main.mm + imgui_impl_osx.mm + imgui_impl_opengl3.cpp <BR>
 
 [example_glfw_wgpu/](https://github.com/ocornut/imgui/blob/master/examples/example_glfw_wgpu/) <BR>
 GLFW + WebGPU example. Supports Emscripten (web), Dawn (native), WGPU (native). <BR>

docs/FAQ.md

@@ -570,8 +570,8 @@ typedef ImU64 ImTextureID;  // Default: store up to 64-bits (any pointer or inte
 // Store a ImTextureID _or_ a ImTextureData*.
 struct ImTextureRef
 {
-    ImTextureRef()                          { _TexData = NULL; _TexID = ImTextureID_Invalid; }
-    ImTextureRef(ImTextureID tex_id)        { _TexData = NULL; _TexID = tex_id; }
+    ImTextureRef()                          { _TexData = nullptr; _TexID = ImTextureID_Invalid; }
+    ImTextureRef(ImTextureID tex_id)        { _TexData = nullptr; _TexID = tex_id; }
     inline ImTextureID  GetTexID() const    { return _TexData ? _TexData->TexID : _TexID; }
 
     // Members (either are set, never both!)
@@ -589,7 +589,7 @@ struct ImTextureRef
    We intentionally do not provide an `ImTextureRef` constructor for this: we don't expect this to be frequently useful to the end-user, and it would be erroneously called by many legacy code.
  - There is no constructor to create a `ImTextureRef` from a `ImTextureData*` as we don't expect this to be useful to the end-user, and it would be erroneously called by many legacy code.
  - If you want to bind the current atlas when using custom rectangles, you can use `io.Fonts->TexRef`.
- - Binding generators for languages such as C (which don't have constructors), should provide a helper, e.g. `inline ImTextureRef ImTextureRefFromID(ImTextureID tex_id) { ImTextureRef tex_ref = { ._TexData = NULL, .TexID = tex_id }; return tex_ref; }`
+ - Binding generators for languages such as C (which don't have constructors), should provide a helper, e.g. `inline ImTextureRef ImTextureRefFromID(ImTextureID tex_id) { ImTextureRef tex_ref = { ._TexData = nullptr, .TexID = tex_id }; return tex_ref; }`
 
 **Please read documentations or tutorials on your graphics API to understand how to display textures on the screen before moving onward.**
 
@@ -780,7 +780,7 @@ style.FontScaleDpi = 2.0f;
 
 To change font size:
 ```cpp
-ImGui::PushFont(NULL, 42.0f); // This will be multiplied by style.FontScaleDpi
+ImGui::PushFont(nullptr, 42.0f); // This will be multiplied by style.FontScaleDpi
 ```
 To change font and font size:
 ```cpp

docs/FONTS.md

@@ -96,7 +96,7 @@ atlas->AddFont(...);
 
 v1.92 introduces a newer, dynamic font system. It requires backend to support the `ImGuiBackendFlags_HasTextures` feature:
 - Users of icons, Asian and non-English languages do not need to pre-build all glyphs ahead of time. Saving on loading time, memory, and also reducing issues with missing glyphs. Specifying glyph ranges is not needed anymore.
-- `PushFont(NULL, new_size)` may be used anytime to change font size.
+- `PushFont(nullptr, new_size)` may be used anytime to change font size.
 - Packing custom rectangles is more convenient as pixels may be written to immediately.
 - Any update to fonts previously required backend specific calls to re-upload the texture, and said calls were not portable across backends. It is now possible to scale fonts etc. in a way that doesn't require you to make backend-specific calls.
 - It is possible to plug a custom loader/backend to any font source.