Skip to content

Commit 9f21cea

Browse files
committed
Update code using Dear ImGui for v1.91.2
1 parent 9dffb36 commit 9f21cea

File tree

2 files changed

+34
-6
lines changed

2 files changed

+34
-6
lines changed

neo/sys/imgui_savestyle.cpp

Lines changed: 33 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@ namespace DG {
121121
D3_IMATTR_FLOAT( TabBorderSize ) \
122122
D3_IMATTR_FLOAT( TabMinWidthForCloseButton ) \
123123
D3_IMATTR_FLOAT( TabBarBorderSize ) \
124+
D3_IMATTR_FLOAT( TabBarOverlineSize ) \
124125
D3_IMATTR_FLOAT( TableAngledHeadersAngle ) \
125126
D3_IMATTR_VEC2( TableAngledHeadersTextAlign ) \
126127
D3_IMATTR_DIR( ColorButtonPosition ) \
@@ -186,11 +187,13 @@ namespace DG {
186187
D3_IMSTYLE_COLOR( ResizeGrip ) \
187188
D3_IMSTYLE_COLOR( ResizeGripHovered ) \
188189
D3_IMSTYLE_COLOR( ResizeGripActive ) \
189-
D3_IMSTYLE_COLOR( Tab ) \
190190
D3_IMSTYLE_COLOR( TabHovered ) \
191-
D3_IMSTYLE_COLOR( TabActive ) \
192-
D3_IMSTYLE_COLOR( TabUnfocused ) \
193-
D3_IMSTYLE_COLOR( TabUnfocusedActive ) \
191+
D3_IMSTYLE_COLOR( Tab ) \
192+
D3_IMSTYLE_COLOR( TabSelected ) \
193+
D3_IMSTYLE_COLOR( TabSelectedOverline ) \
194+
D3_IMSTYLE_COLOR( TabDimmed ) \
195+
D3_IMSTYLE_COLOR( TabDimmedSelected ) \
196+
D3_IMSTYLE_COLOR( TabDimmedSelectedOverline ) \
194197
DGIMST_ENABLE_IF_DOCKING( D3_IMSTYLE_COLOR( DockingPreview ) ) \
195198
DGIMST_ENABLE_IF_DOCKING( D3_IMSTYLE_COLOR( DockingEmptyBg ) ) \
196199
D3_IMSTYLE_COLOR( PlotLines ) \
@@ -202,6 +205,7 @@ namespace DG {
202205
D3_IMSTYLE_COLOR( TableBorderLight ) \
203206
D3_IMSTYLE_COLOR( TableRowBg ) \
204207
D3_IMSTYLE_COLOR( TableRowBgAlt ) \
208+
D3_IMSTYLE_COLOR( TextLink ) \
205209
D3_IMSTYLE_COLOR( TextSelectedBg ) \
206210
D3_IMSTYLE_COLOR( DragDropTarget ) \
207211
D3_IMSTYLE_COLOR( NavHighlight ) \
@@ -297,6 +301,21 @@ static void parseBehaviorLine( ImGuiStyle& s, const char* line )
297301
#undef D3_IMATTR_DIR
298302
#undef D3_IMATTR_BOOL
299303

304+
namespace {
305+
// for renamed colors
306+
struct ImGuiColorBackwardCompat {
307+
const char* oldColorStr;
308+
enum ImGuiCol_ newColorVal;
309+
};
310+
311+
static struct ImGuiColorBackwardCompat backwardCompatColorMappings[] = {
312+
{ "TabActive", ImGuiCol_TabSelected },
313+
{ "TabUnfocused", ImGuiCol_TabDimmed },
314+
{ "TabUnfocusedActive", ImGuiCol_TabDimmedSelected },
315+
};
316+
317+
} //anon namespace
318+
300319
static void parseColorLine( ImGuiStyle& s, const char* line )
301320
{
302321
ImVec4 c;
@@ -313,9 +332,18 @@ static void parseColorLine( ImGuiStyle& s, const char* line )
313332

314333
// NOTE: here backwards-compat is also possible, like
315334
// if ( sscanf( line, "OldColorName = %f , %f , %f , %f", &c.x, &c.y, &c.z, &c.w) == 4 ) {
316-
// s.Colors[ ImGuiCol_NewColorName = c;
335+
// s.Colors[ ImGuiCol_NewColorName ] = c;
317336
// return;
318337
// }
338+
for( const ImGuiColorBackwardCompat& bc : backwardCompatColorMappings ) {
339+
char matchString[64];
340+
snprintf( matchString, sizeof(matchString), "%s = %%f , %%f , %%f , %%f", bc.oldColorStr );
341+
342+
if ( sscanf( line, matchString, &c.x, &c.y, &c.z, &c.w) == 4 ) {
343+
s.Colors[ bc.newColorVal ] = c;
344+
return;
345+
}
346+
}
319347

320348
warnPrintf( "Invalid line in ImGui style under [colors] section: '%s'\n", line );
321349
}

neo/sys/sys_imgui.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -632,7 +632,7 @@ void SetDhewm3StyleColors( ImGuiStyle* dst )
632632
colors[ImGuiCol_TitleBgActive] = ImVec4(0.03f, 0.33f, 0.33f, 1.00f);
633633
//colors[ImGuiCol_TitleBg] = ImVec4(0.12f, 0.17f, 0.16f, 0.90f);
634634
colors[ImGuiCol_TabHovered] = ImVec4(0.42f, 0.69f, 1.00f, 0.80f);
635-
colors[ImGuiCol_TabActive] = ImVec4(0.24f, 0.51f, 0.83f, 1.00f);
635+
colors[ImGuiCol_TabSelected] = ImVec4(0.24f, 0.51f, 0.83f, 1.00f);
636636
}
637637

638638
void SetUserStyleColors()

0 commit comments

Comments
 (0)