mirrors/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2026-04-25 00:35:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into docking, incl conflict merge in BeginMenuBar() for #8267

Browse Source 
# Conflicts:
#	imgui_widgets.cpp
This commit is contained in:
ocornut
2025-01-24 19:40:54 +01:00
parent 64e738cae7 8a1613a382
commit 355cb589e3
8 changed files with 149 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
misc/freetype/imgui_freetype.cpp
View File

@@ -33,7 +33,7 @@
// - For correct results you need to be using sRGB and convert to linear space in the pixel shader output.
// - The default dear imgui styles will be impacted by this change (alpha values will need tweaking).
// FIXME: cfg.OversampleH, OversampleV are not supported (but perhaps not so necessary with this rasterizer).
// FIXME: cfg.OversampleH, OversampleV are not supported, but generally not necessary with this rasterizer because Hinting makes everything look better.
#include "imgui.h"
#ifndef IMGUI_DISABLE