Skip to content

[Imgui] Update docking-experimental and freetype features to 1.81#16268

Merged
strega-nil merged 6 commits intomicrosoft:masterfrom
RT2Code:imgui
Mar 1, 2021
Merged

[Imgui] Update docking-experimental and freetype features to 1.81#16268
strega-nil merged 6 commits intomicrosoft:masterfrom
RT2Code:imgui

Conversation

@RT2Code
Copy link
Copy Markdown
Contributor

@RT2Code RT2Code commented Feb 17, 2021

Update the docking-experimental feature from 1.79 to 1.81.

The Freetype integration procedure was changed with 1.81, the IMGUI_ENABLE_FREETYPE macro should be defined in imconfig.h.

  • We refactored some of imgui_freetype to make integration easier (a simple #define IMGUI_ENABLE_FREETYPE in your config file does the job for most users) and also to fix some inconsistencies. The majority of imgui_freetyoe users shouldn't be affected as the RasterizerFlags were rarely used.
  • Removed ImGuiFreeType::BuildFontAtlas(). Kept inline redirection function.
  • Prefer using #define IMGUI_ENABLE_FREETYPE, but there's a runtime selection path available too.
  • The shared extra flags parameters (very rarely used) are now stored in ImFontAtlas::FontBuilderFlags.
  • Renamed ImFontConfig::RasterizerFlags (used by FreeType) to ImFontConfig::FontBuilderFlags.
  • Renamed ImGuiFreeType::XXX flags to ImGuiFreeTypeBuilderFlags_XXX for consistency with other API.

I updated the CMake file to uncomment this macro in imconfig.h when the user ask for the freetype feature.

@NancyLi1013 NancyLi1013 added the category:port-update The issue is with a library, which is requesting update new revision label Feb 18, 2021
@NancyLi1013
Copy link
Copy Markdown
Contributor

The regressions caused by gsoap will be fixed by PR #16270.

@ras0219-msft
Copy link
Copy Markdown
Contributor

/azp run

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 1 pipeline(s).

@NancyLi1013 NancyLi1013 added the info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this. label Feb 19, 2021
Copy link
Copy Markdown
Contributor

@ras0219-msft ras0219-msft left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Editing the sources during configure causes a race condition if we configure release and debug in parallel, so I've moved the edit to the portfile as a post-build step.

As a drive-by, I've changed the versioning scheme to relaxed which will enable our new versioning features.

This LGTM, though I'd appreciate independent confirmation from @RT222 that this still fixes their issue :)

Thanks for the PR!

@JackBoosY JackBoosY removed the info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this. label Feb 20, 2021
@RT2Code
Copy link
Copy Markdown
Contributor Author

RT2Code commented Feb 20, 2021

The IMGUI_ENABLE_FREETYPE macro should only be defined in imconfig.hpp when the freetype feature is enabled, I fixed it. I also moved the string replacement code for wchar32 to the portfile for the reasons you mentioned about parallel configuration.

@JackBoosY JackBoosY added the info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this. label Feb 25, 2021
@strega-nil strega-nil merged commit b5bc9d5 into microsoft:master Mar 1, 2021
@RT2Code RT2Code deleted the imgui branch March 1, 2021 17:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

category:port-update The issue is with a library, which is requesting update new revision info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

imgui[docking-experimental,glfw-binding,opengl3-glbinding-binding] version 1.81#1 build failure

6 participants