dhewm/dhewm3
0
0
Fork 0
mirror of https://github.com/dhewm/dhewm3.git synced 2025-02-27 22:40:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

Adjust imgui_savestyle.cpp for 1.91.4

Browse source 
ImGuiCol_NavHighlight has been renamed to ImGuiCol_NavCursor
This commit is contained in:
Daniel Gibson 2024-10-29 03:55:07 +01:00
parent 97edc598c1
commit 81cab591da
1 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
neo/sys/imgui_savestyle.cpp
View file

@ -4,7 +4,7 @@
* *
* Hosted at https://github.com/DanielGibson/Snippets/ * Hosted at https://github.com/DanielGibson/Snippets/
* *
* Written for/tested with Dear ImGui v1.90.8 (incl. Docking Branch) * Written for/tested with Dear ImGui v1.91.4 (incl. Docking Branch)
* *
* If anything changes in struct ImGuiStyle or enum ImGuiCol_, this code should detect it * If anything changes in struct ImGuiStyle or enum ImGuiCol_, this code should detect it
* during compilation and give (hopefully) helpful errors with static_assert() (always check and * during compilation and give (hopefully) helpful errors with static_assert() (always check and
@ -208,7 +208,7 @@ namespace DG {
D3_IMSTYLE_COLOR( TextLink ) \ D3_IMSTYLE_COLOR( TextLink ) \
D3_IMSTYLE_COLOR( TextSelectedBg ) \ D3_IMSTYLE_COLOR( TextSelectedBg ) \
D3_IMSTYLE_COLOR( DragDropTarget ) \ D3_IMSTYLE_COLOR( DragDropTarget ) \
D3_IMSTYLE_COLOR( NavHighlight ) \ D3_IMSTYLE_COLOR( NavCursor ) \
D3_IMSTYLE_COLOR( NavWindowingHighlight ) \ D3_IMSTYLE_COLOR( NavWindowingHighlight ) \
D3_IMSTYLE_COLOR( NavWindowingDimBg ) \ D3_IMSTYLE_COLOR( NavWindowingDimBg ) \
D3_IMSTYLE_COLOR( ModalWindowDimBg ) D3_IMSTYLE_COLOR( ModalWindowDimBg )
@ -309,9 +309,10 @@ struct ImGuiColorBackwardCompat {
}; };
static struct ImGuiColorBackwardCompat backwardCompatColorMappings[] = { static struct ImGuiColorBackwardCompat backwardCompatColorMappings[] = {
{ "TabActive", ImGuiCol_TabSelected }, { "TabActive", ImGuiCol_TabSelected }, // renamed in 1.90.9
{ "TabUnfocused", ImGuiCol_TabDimmed }, { "TabUnfocused", ImGuiCol_TabDimmed }, // renamed in 1.90.9
{ "TabUnfocusedActive", ImGuiCol_TabDimmedSelected }, { "TabUnfocusedActive", ImGuiCol_TabDimmedSelected }, // renamed in 1.90.9
{ "NavHighlight", ImGuiCol_NavCursor }, // renamed in 1.91.4
}; };
} //anon namespace } //anon namespace
@ -330,11 +331,6 @@ static void parseColorLine( ImGuiStyle& s, const char* line )
#undef D3_IMSTYLE_COLOR #undef D3_IMSTYLE_COLOR
// NOTE: here backwards-compat is also possible, like
// if ( sscanf( line, "OldColorName = %f , %f , %f , %f", &c.x, &c.y, &c.z, &c.w) == 4 ) {
// s.Colors[ ImGuiCol_NewColorName ] = c;
// return;
// }
for( const ImGuiColorBackwardCompat& bc : backwardCompatColorMappings ) { for( const ImGuiColorBackwardCompat& bc : backwardCompatColorMappings ) {
char matchString[64]; char matchString[64];
snprintf( matchString, sizeof(matchString), "%s = %%f , %%f , %%f , %%f", bc.oldColorStr ); snprintf( matchString, sizeof(matchString), "%s = %%f , %%f , %%f , %%f", bc.oldColorStr );