@ -3458,14 +3458,23 @@ bool ImGui::InputTextEx(const char* label, const char* hint, char* buf, int buf_
EndGroup ( ) ;
EndGroup ( ) ;
return false ;
return false ;
}
}
if ( ! BeginChildFrame ( id , frame_bb . GetSize ( ) ) )
// We reproduce the contents of BeginChildFrame() in order to provide 'label' so our window internal data are easier to read/debug.
PushStyleColor ( ImGuiCol_ChildBg , style . Colors [ ImGuiCol_FrameBg ] ) ;
PushStyleVar ( ImGuiStyleVar_ChildRounding , style . FrameRounding ) ;
PushStyleVar ( ImGuiStyleVar_ChildBorderSize , style . FrameBorderSize ) ;
PushStyleVar ( ImGuiStyleVar_WindowPadding , style . FramePadding ) ;
bool child_visible = BeginChildEx ( label , id , frame_bb . GetSize ( ) , true , ImGuiWindowFlags_NoMove | ImGuiWindowFlags_AlwaysUseWindowPadding ) ;
PopStyleVar ( 3 ) ;
PopStyleColor ( ) ;
if ( ! child_visible )
{
{
EndChildFrame ( ) ;
EndChild ( ) ;
EndGroup ( ) ;
EndGroup ( ) ;
return false ;
return false ;
}
}
draw_window = g . CurrentWindow ; // Child window
draw_window = g . CurrentWindow ; // Child window
draw_window - > DC . NavLayerActiveMaskNext | = draw_window - > DC . NavLayerCurrentMask ; // This is to ensure that EndChild() will display a navigation highlight
draw_window - > DC . NavLayerActiveMaskNext | = draw_window - > DC . NavLayerCurrentMask ; // This is to ensure that EndChild() will display a navigation highlight so we can "enter" into it.
inner_size . x - = draw_window - > ScrollbarSizes . x ;
inner_size . x - = draw_window - > ScrollbarSizes . x ;
}
}
else
else
@ -4151,7 +4160,7 @@ bool ImGui::InputTextEx(const char* label, const char* hint, char* buf, int buf_
if ( is_multiline )
if ( is_multiline )
{
{
Dummy ( text_size + ImVec2 ( 0.0f , g . FontSize ) ) ; // Always add room to scroll an extra line
Dummy ( text_size + ImVec2 ( 0.0f , g . FontSize ) ) ; // Always add room to scroll an extra line
EndChild Frame ( ) ;
EndChild ( ) ;
EndGroup ( ) ;
EndGroup ( ) ;
}
}