@ -401,7 +401,7 @@
- 2016 / 05 / 07 ( 1.49 ) - removed confusing set of GetInternalState ( ) , GetInternalStateSize ( ) , SetInternalState ( ) functions . Now using CreateContext ( ) , DestroyContext ( ) , GetCurrentContext ( ) , SetCurrentContext ( ) .
- 2016 / 05 / 02 ( 1.49 ) - renamed SetNextTreeNodeOpened ( ) to SetNextTreeNodeOpen ( ) , no redirection .
- 2016 / 05 / 01 ( 1.49 ) - obsoleted old signature of CollapsingHeader ( const char * label , const char * str_id = NULL , bool display_frame = true , bool default_open = false ) as extra parameters were badly designed and rarely used . You can replace the " default_open = true " flag in new API with CollapsingHeader ( label , ImGuiTreeNodeFlags_DefaultOpen ) .
- 2016 / 04 / 26 ( 1.49 ) - changed ImDrawList : : PushClipRect ( ImVec4 rect ) to ImDraw : : PushClipRect ( Imvec2 min , ImVec2 max , bool intersect_with_current_clip_rect = false ) . Note that higher - level ImGui : : PushClipRect ( ) is preferable because it will clip at logic / widget level , whereas ImDrawList : : PushClipRect ( ) only affect your renderer .
- 2016 / 04 / 26 ( 1.49 ) - changed ImDrawList : : PushClipRect ( ImVec4 rect ) to ImDraw List : : PushClipRect ( Imvec2 min , ImVec2 max , bool intersect_with_current_clip_rect = false ) . Note that higher - level ImGui : : PushClipRect ( ) is preferable because it will clip at logic / widget level , whereas ImDrawList : : PushClipRect ( ) only affect your renderer .
- 2016 / 04 / 03 ( 1.48 ) - removed style . WindowFillAlphaDefault setting which was redundant . Bake default BG alpha inside style . Colors [ ImGuiCol_WindowBg ] and all other Bg color values . ( ref github issue # 337 ) .
- 2016 / 04 / 03 ( 1.48 ) - renamed ImGuiCol_TooltipBg to ImGuiCol_PopupBg , used by popups / menus and tooltips . popups / menus were previously using ImGuiCol_WindowBg . ( ref github issue # 337 )
- 2016 / 03 / 21 ( 1.48 ) - renamed GetWindowFont ( ) to GetFont ( ) , GetWindowFontSize ( ) to GetFontSize ( ) . Kept inline redirection function ( will obsolete ) .
@ -850,13 +850,6 @@
# endif
# endif
// Enforce cdecl calling convention for functions called by the standard library, in case compilation settings changed the default to e.g. __vectorcall
# ifdef _MSC_VER
# define IMGUI_CDECL __cdecl
# else
# define IMGUI_CDECL
# endif
static const ImS32 IM_S32_MIN = 0x80000000 ; // INT_MIN;
static const ImS32 IM_S32_MAX = 0x7FFFFFFF ; // INT_MAX;
static const ImU32 IM_U32_MIN = 0 ;
@ -879,7 +872,7 @@ static void SetWindowScrollY(ImGuiWindow* window, float new_scroll_y
static void SetWindowPos ( ImGuiWindow * window , const ImVec2 & pos , ImGuiCond cond ) ;
static void SetWindowSize ( ImGuiWindow * window , const ImVec2 & size , ImGuiCond cond ) ;
static void SetWindowCollapsed ( ImGuiWindow * window , bool collapsed , ImGuiCond cond ) ;
static ImGuiWindow * FindHoveredWindow ( ) ;
static void FindHoveredWindow ( ) ;
static ImGuiWindow * CreateNewWindow ( const char * name , ImVec2 size , ImGuiWindowFlags flags ) ;
static void CheckStacksSize ( ImGuiWindow * window , bool write ) ;
static ImVec2 CalcNextScrollFromScrollTargetAndClamp ( ImGuiWindow * window , bool snap_on_edges ) ;
@ -3219,9 +3212,11 @@ static void ImGui::NavUpdateWindowing()
// Apply menu/layer toggle
if ( apply_toggle_layer & & g . NavWindow )
{
// Move to parent menu if necessary
ImGuiWindow * new_nav_window = g . NavWindow ;
while ( ( new_nav_window - > DC . NavLayerActiveMask & ( 1 < < 1 ) ) = = 0 & & ( new_nav_window - > Flags & ImGuiWindowFlags_ChildWindow ) ! = 0 & & ( new_nav_window - > Flags & ( ImGuiWindowFlags_Popup | ImGuiWindowFlags_ChildMenu ) ) = = 0 )
new_nav_window = new_nav_window - > ParentWindow ;
if ( new_nav_window ! = g . NavWindow )
{
ImGuiWindow * old_nav_window = g . NavWindow ;
@ -3998,7 +3993,7 @@ void ImGui::UpdatePlatformWindows()
if ( ImGuiWindow * window_for_title = viewport - > Window )
{
const char * title_begin = window_for_title - > Name ;
char * title_end = ( char * ) ( intptr_t ) ImGui: : FindRenderedTextEnd( title_begin ) ;
char * title_end = ( char * ) ( intptr_t ) ( title_begin ) ;
const ImGuiID title_hash = ImHash ( title_begin , ( int ) ( title_end - title_begin ) ) ;
if ( viewport - > LastNameHash ! = title_hash )
{
@ -4138,8 +4133,7 @@ void ImGui::UpdateHoveredWindowAndCaptureFlags()
// - Child windows can extend beyond the limit of their parent so we need to derive HoveredRootWindow from HoveredWindow.
// - When moving a window we can skip the search, which also conveniently bypasses the fact that window->WindowRectClipped is lagging as this point of the frame.
// - We also support the moved window toggling the NoInputs flag after moving has started in order to be able to detect windows below it, which is useful for e.g. docking mechanisms.
g . HoveredWindow = ( g . MovingWindow & & ! ( g . MovingWindow - > Flags & ImGuiWindowFlags_NoInputs ) ) ? g . MovingWindow : FindHoveredWindow ( ) ;
g . HoveredRootWindow = g . HoveredWindow ? g . HoveredWindow - > RootWindow : NULL ;
FindHoveredWindow ( ) ;
IM_ASSERT ( g . HoveredWindow = = NULL | | g . HoveredWindow = = g . MovingWindow | | g . HoveredWindow - > Viewport = = g . MouseRefViewport ) ;
// Modal windows prevents cursor from hovering behind them.
@ -5523,10 +5517,15 @@ void ImGui::CalcListClipping(int items_count, float items_height, int* out_items
// Find window given position, search front-to-back
// FIXME: Note that we have a lag here because WindowRectClipped is updated in Begin() so windows moved by user via SetWindowPos() and not SetNextWindowPos() will have that rectangle lagging by a frame at the time FindHoveredWindow() is called, aka before the next Begin(). Moving window thankfully isn't affected.
static ImGuiWindow * FindHoveredWindow ( )
static void FindHoveredWindow ( )
{
ImGuiContext & g = * GImGui ;
for ( int i = g . Windows . Size - 1 ; i > = 0 ; i - - )
ImGuiWindow * hovered_window = NULL ;
if ( g . MovingWindow & & ! ( g . MovingWindow - > Flags & ImGuiWindowFlags_NoInputs ) )
hovered_window = g . MovingWindow ;
for ( int i = g . Windows . Size - 1 ; i > = 0 & & hovered_window = = NULL ; i - - )
{
ImGuiWindow * window = g . Windows [ i ] ;
if ( ! window - > Active )
@ -5540,9 +5539,17 @@ static ImGuiWindow* FindHoveredWindow()
// Using the clipped AABB, a child window will typically be clipped by its parent (not always)
ImRect bb ( window - > OuterRectClipped . Min - g . Style . TouchExtraPadding , window - > OuterRectClipped . Max + g . Style . TouchExtraPadding ) ;
if ( bb . Contains ( g . IO . MousePos ) )
return window ;
{
if ( hovered_window = = NULL )
hovered_window = window ;
if ( hovered_window )
break ;
}
}
return NULL ;
g . HoveredWindow = hovered_window ;
g . HoveredRootWindow = g . HoveredWindow ? g . HoveredWindow - > RootWindow : NULL ;
}
// Test if mouse cursor is hovering given rectangle
@ -6492,10 +6499,9 @@ static ImGuiWindow* CreateNewWindow(const char* name, ImVec2 size, ImGuiWindowFl
// User can disable loading and saving of settings. Tooltip and child windows also don't store settings.
if ( ! ( flags & ImGuiWindowFlags_NoSavedSettings ) )
{
// Retrieve settings from .ini file
if ( ImGuiWindowSettings * settings = ImGui : : FindWindowSettings ( window - > ID ) )
{
// Retrieve settings from .ini file
window - > SettingsIdx = g . SettingsWindows . index_from_pointer ( settings ) ;
SetWindowConditionAllowFlags ( window , ImGuiCond_FirstUseEver , false ) ;
if ( settings - > ViewportId )
@ -6512,7 +6518,6 @@ static ImGuiWindow* CreateNewWindow(const char* name, ImVec2 size, ImGuiWindowFl
if ( ImLengthSqr ( settings - > Size ) > 0.00001f )
size = ImFloor ( settings - > Size ) ;
}
}
window - > Size = window - > SizeFull = window - > SizeFullAtLastBegin = size ;
if ( ( flags & ImGuiWindowFlags_AlwaysAutoResize ) ! = 0 )
@ -7007,6 +7012,12 @@ bool ImGui::Begin(const char* name, bool* p_open, ImGuiWindowFlags flags)
flags = window - > Flags ;
}
// Parent window is latched only on the first call to Begin() of the frame, so further append-calls can be done from a different window stack
ImGuiWindow * parent_window_in_stack = g . CurrentWindowStack . empty ( ) ? NULL : g . CurrentWindowStack . back ( ) ;
ImGuiWindow * parent_window = first_begin_of_the_frame ? ( ( flags & ( ImGuiWindowFlags_ChildWindow | ImGuiWindowFlags_Popup ) ) ? parent_window_in_stack : NULL ) : window - > ParentWindow ;
IM_ASSERT ( parent_window ! = NULL | | ! ( flags & ImGuiWindowFlags_ChildWindow ) ) ;
window - > HasCloseButton = ( p_open ! = NULL ) ;
// Update the Appearing flag
bool window_just_activated_by_user = ( window - > LastFrameActive < current_frame - 1 ) ; // Not using !WasActive because the implicit "Debug" window would always toggle off->on
const bool window_just_appearing_after_hidden_for_resize = ( window - > HiddenFrames > 0 ) ;
@ -7017,15 +7028,9 @@ bool ImGui::Begin(const char* name, bool* p_open, ImGuiWindowFlags flags)
window_just_activated_by_user | = ( window ! = popup_ref . Window ) ;
}
window - > Appearing = ( window_just_activated_by_user | | window_just_appearing_after_hidden_for_resize ) ;
window - > HasCloseButton = ( p_open ! = NULL ) ;
if ( window - > Appearing )
SetWindowConditionAllowFlags ( window , ImGuiCond_Appearing , true ) ;
// Parent window is latched only on the first call to Begin() of the frame, so further append-calls can be done from a different window stack
ImGuiWindow * parent_window_in_stack = g . CurrentWindowStack . empty ( ) ? NULL : g . CurrentWindowStack . back ( ) ;
ImGuiWindow * parent_window = first_begin_of_the_frame ? ( ( flags & ( ImGuiWindowFlags_ChildWindow | ImGuiWindowFlags_Popup ) ) ? parent_window_in_stack : NULL ) : window - > ParentWindow ;
IM_ASSERT ( parent_window ! = NULL | | ! ( flags & ImGuiWindowFlags_ChildWindow ) ) ;
// Add to stack
// We intentionally set g.CurrentWindow to NULL to prevent usage until when the viewport is set, then will call SetCurrentWindow()
g . CurrentWindowStack . push_back ( window ) ;
@ -7310,7 +7315,7 @@ bool ImGui::Begin(const char* name, bool* p_open, ImGuiWindowFlags flags)
if ( window - > ViewportOwned )
window - > WindowRounding = 0.0f ;
// Prepare for focus requests
// Prepare for item focus requests
window - > FocusIdxAllRequestCurrent = ( window - > FocusIdxAllRequestNext = = INT_MAX | | window - > FocusIdxAllCounter = = - 1 ) ? INT_MAX : ( window - > FocusIdxAllRequestNext + ( window - > FocusIdxAllCounter + 1 ) ) % ( window - > FocusIdxAllCounter + 1 ) ;
window - > FocusIdxTabRequestCurrent = ( window - > FocusIdxTabRequestNext = = INT_MAX | | window - > FocusIdxTabCounter = = - 1 ) ? INT_MAX : ( window - > FocusIdxTabRequestNext + ( window - > FocusIdxTabCounter + 1 ) ) % ( window - > FocusIdxTabCounter + 1 ) ;
window - > FocusIdxAllCounter = window - > FocusIdxTabCounter = - 1 ;
@ -7320,7 +7325,7 @@ bool ImGui::Begin(const char* name, bool* p_open, ImGuiWindowFlags flags)
window - > Scroll = CalcNextScrollFromScrollTargetAndClamp ( window , true ) ;
window - > ScrollTarget = ImVec2 ( FLT_MAX , FLT_MAX ) ;
// Apply focus, new windows appears in front
// Apply window focus (new and reactivated windows are moved to front)
bool want_focus = false ;
if ( window_just_activated_by_user & & ! ( flags & ImGuiWindowFlags_NoFocusOnAppearing ) )
if ( ! ( flags & ( ImGuiWindowFlags_ChildWindow | ImGuiWindowFlags_Tooltip ) ) | | ( flags & ImGuiWindowFlags_Popup ) )
@ -7411,7 +7416,7 @@ bool ImGui::Begin(const char* name, bool* p_open, ImGuiWindowFlags flags)
//window->Viewport->Alpha = ((bg_col & IM_COL32_A_MASK) >> IM_COL32_A_SHIFT) / 255.0f;
bg_col = ( bg_col | IM_COL32_A_MASK ) ;
}
window - > DrawList - > AddRectFilled ( window - > Pos + ImVec2 ( 0 , window - > TitleBarHeight ( ) ) , window - > Pos + window - > Size , bg_col , window_rounding , ( flags & ImGuiWindowFlags_NoTitleBar ) ? ImDrawCornerFlags_All : ImDrawCornerFlags_Bot ) ;
window - > DrawList - > AddRectFilled ( window - > Pos + ImVec2 ( 0 , window - > TitleBarHeight ( ) ) , window - > Pos + window - > Size , bg_col , window_rounding , ( flags & ImGuiWindowFlags_NoTitleBar ) ? ImDrawCornerFlags_All : ImDrawCornerFlags_Bot ) ;
// Title bar
ImU32 title_bar_col = GetColorU32 ( window - > Collapsed ? ImGuiCol_TitleBgCollapsed : title_bar_is_highlight ? ImGuiCol_TitleBgActive : ImGuiCol_TitleBg ) ;
@ -7457,7 +7462,7 @@ bool ImGui::Begin(const char* name, bool* p_open, ImGuiWindowFlags flags)
window - > DrawList - > AddLine ( border . Min , border . Max , GetColorU32 ( ImGuiCol_SeparatorActive ) , ImMax ( 1.0f , window_border_size ) ) ;
}
if ( style . FrameBorderSize > 0 & & ! ( flags & ImGuiWindowFlags_NoTitleBar ) )
window - > DrawList - > AddLine ( title_bar_rect . GetBL ( ) + ImVec2 ( style . WindowBorderSize , - 1 ) , title_bar_rect . GetBR ( ) + ImVec2 ( - style . WindowBorderSize , - 1 ) , GetColorU32 ( ImGuiCol_Border ) , style . FrameBorderSize ) ;
window - > DrawList - > AddLine ( title_bar_rect . GetBL ( ) + ImVec2 ( style . WindowBorderSize , - 1 ) , title_bar_rect . GetBR ( ) + ImVec2 ( - style . WindowBorderSize , - 1 ) , GetColorU32 ( ImGuiCol_Border ) , style . FrameBorderSize ) ;
}
// Draw navigation selection/windowing rectangle border
@ -7640,10 +7645,11 @@ bool ImGui::Begin(const char* name, bool* p_open, ImGuiWindowFlags flags)
window - > BeginCount + + ;
g . NextWindowData . Clear ( ) ;
// Child window can be out of sight and have "negative" clip windows.
// Mark them as collapsed so commands are skipped earlier (we can't manually collapse them because they have no title bar).
if ( flags & ImGuiWindowFlags_ChildWindow )
{
// Child window can be out of sight and have "negative" clip windows.
// Mark them as collapsed so commands are skipped earlier (we can't manually collapse them because they have no title bar).
IM_ASSERT ( ( flags & ImGuiWindowFlags_NoTitleBar ) ! = 0 ) ;
window - > Collapsed = parent_window & & parent_window - > Collapsed ;
@ -7655,6 +7661,8 @@ bool ImGui::Begin(const char* name, bool* p_open, ImGuiWindowFlags flags)
if ( window - > Collapsed )
window - > Active = false ;
}
// Don't render if style alpha is 0.0 at the time of Begin(). This is arbitrary and inconsistent but has been there for a long while (may remove at some point)
if ( style . Alpha < = 0.0f )
window - > Active = false ;
@ -14922,7 +14930,8 @@ void ImGui::ShowMetricsWindow(bool* p_open)
static bool show_draw_cmd_clip_rects = true ;
static bool show_window_begin_order = false ;
ImGui : : Checkbox ( " Show clipping rectangles when hovering draw commands " , & show_draw_cmd_clip_rects ) ;
ImGui : : Checkbox ( " Show window begin order " , & show_window_begin_order ) ;
ImGui : : Checkbox ( " Ctrl shows window begin order " , & show_window_begin_order ) ;
ImGui : : Separator ( ) ;
struct Funcs
@ -15012,12 +15021,13 @@ void ImGui::ShowMetricsWindow(bool* p_open)
ImGuiWindowFlags flags = window - > Flags ;
NodeDrawList ( window , window - > Viewport , window - > DrawList , " DrawList " ) ;
ImGui : : BulletText ( " Pos: (%.1f,%.1f), Size: (%.1f,%.1f), SizeContents (%.1f,%.1f) " , window - > Pos . x , window - > Pos . y , window - > Size . x , window - > Size . y , window - > SizeContents . x , window - > SizeContents . y ) ;
ImGui : : BulletText ( " Flags: 0x%08X (%s%s%s%s%s%s%s ..)" , flags ,
ImGui : : BulletText ( " Flags: 0x%08X (%s%s%s%s%s%s%s %s ..)" , flags ,
( flags & ImGuiWindowFlags_ChildWindow ) ? " Child " : " " , ( flags & ImGuiWindowFlags_Tooltip ) ? " Tooltip " : " " , ( flags & ImGuiWindowFlags_Popup ) ? " Popup " : " " ,
( flags & ImGuiWindowFlags_Modal ) ? " Modal " : " " , ( flags & ImGuiWindowFlags_ChildMenu ) ? " ChildMenu " : " " , ( flags & ImGuiWindowFlags_NoSavedSettings ) ? " NoSavedSettings " : " " ,
( flags & ImGuiWindowFlags_ AlwaysAutoResize) ? " AlwaysAutoResize " : " " ) ;
( flags & ImGuiWindowFlags_ NoInputs) ? " NoInputs " : " " , ( flags & ImGuiWindowFlags_ AlwaysAutoResize) ? " AlwaysAutoResize " : " " ) ;
ImGui : : BulletText ( " Scroll: (%.2f/%.2f,%.2f/%.2f) " , window - > Scroll . x , GetScrollMaxX ( window ) , window - > Scroll . y , GetScrollMaxY ( window ) ) ;
ImGui : : BulletText ( " Active: %d, WriteAccessed: %d, BeginOrderWithinContext: %d " , window - > Active | | window - > WasActive , window - > WriteAccessed , ( window - > Active | | window - > WasActive ) ? window - > BeginOrderWithinContext : - 1 ) ;
ImGui : : BulletText ( " Active: %d/%d, WriteAccessed: %d, BeginOrderWithinContext: %d " , window - > Active , window - > WasActive , window - > WriteAccessed , ( window - > Active | | window - > WasActive ) ? window - > BeginOrderWithinContext : - 1 ) ;
ImGui : : BulletText ( " NavLastIds: 0x%08X,0x%08X, NavLayerActiveMask: %X " , window - > NavLastIds [ 0 ] , window - > NavLastIds [ 1 ] , window - > DC . NavLayerActiveMask ) ;
ImGui : : BulletText ( " NavLastChildNavWindow: %s " , window - > NavLastChildNavWindow ? window - > NavLastChildNavWindow - > Name : " NULL " ) ;
if ( ! window - > NavRectRel [ 0 ] . IsInverted ( ) )
@ -15093,7 +15103,7 @@ void ImGui::ShowMetricsWindow(bool* p_open)
Funcs : : NodeViewport ( g . Viewports [ i ] ) ;
ImGui : : TreePop ( ) ;
}
if ( ImGui : : TreeNode ( " Popups " , " Open Popups Stack (%d)" , g . OpenPopupStack . Size ) )
if ( ImGui : : TreeNode ( " Popups " , " " , g . OpenPopupStack . Size ) )
{
for ( int i = 0 ; i < g . OpenPopupStack . Size ; i + + )
{
@ -15117,11 +15127,13 @@ void ImGui::ShowMetricsWindow(bool* p_open)
ImGui : : Text ( " NavActive: %d, NavVisible: %d " , g . IO . NavActive , g . IO . NavVisible ) ;
ImGui : : Text ( " NavActivateId: 0x%08X, NavInputId: 0x%08X " , g . NavActivateId , g . NavInputId ) ;
ImGui : : Text ( " NavDisableHighlight: %d, NavDisableMouseHover: %d " , g . NavDisableHighlight , g . NavDisableMouseHover ) ;
ImGui : : Text ( " NavWindowingTarget: '%s' " , g . NavWindowingTarget ? g . NavWindowingTarget - > Name : " NULL " ) ;
ImGui : : Text ( " DragDrop: %d, SourceId = 0x%08X, Payload \" %s \" (%d bytes) " , g . DragDropActive , g . DragDropPayload . SourceId , g . DragDropPayload . DataType , g . DragDropPayload . DataSize ) ;
ImGui : : Text ( " MousePosViewport: 0x%08X, Hovered: 0x%08X -> Ref 0x%08X " , g . IO . MousePosViewport , g . IO . MouseHoveredViewport , g . MouseRefViewport - > ID ) ;
ImGui : : TreePop ( ) ;
}
if ( show_window_begin_order )
if ( g . IO . KeyCtrl & & show_window_begin_order )
{
for ( int n = 0 ; n < g . Windows . Size ; n + + )
{
omar
6 years ago