@ -1200,6 +1200,8 @@ ImGuiIO::ImGuiIO()
# endif # endif
ConfigInputTrickleEventQueue = true ; ConfigInputTrickleEventQueue = true ;
ConfigInputTextCursorBlink = true ; ConfigInputTextCursorBlink = true ;
ConfigInputTextEnterKeepActive = false ;
ConfigDragClickToInputText = false ;
ConfigWindowsResizeFromEdges = true ; ConfigWindowsResizeFromEdges = true ;
ConfigWindowsMoveFromTitleBarOnly = false ; ConfigWindowsMoveFromTitleBarOnly = false ;
ConfigMemoryCompactTimer = 60.0f ; ConfigMemoryCompactTimer = 60.0f ;
@ -2639,13 +2641,11 @@ ImGuiListClipper::~ImGuiListClipper()
End ( ) ; End ( ) ;
} }
// Use case A: Begin() called from constructor with items_height<0, then called again from Step() in StepNo 1
// Use case B: Begin() called from constructor with items_height>0
// FIXME-LEGACY: Ideally we should remove the Begin/End functions but they are part of the legacy API we still support. This is why some of the code in Step() calling Begin() and reassign some fields, spaghetti style.
void ImGuiListClipper : : Begin ( int items_count , float items_height ) void ImGuiListClipper : : Begin ( int items_count , float items_height )
{ {
ImGuiContext & g = * GImGui ; ImGuiContext & g = * GImGui ;
ImGuiWindow * window = g . CurrentWindow ; ImGuiWindow * window = g . CurrentWindow ;
IMGUI_DEBUG_LOG_CLIPPER ( " Clipper: Begin(%d,%.2f) in '%s' \n " , items_count , items_height , window - > Name ) ;
if ( ImGuiTable * table = g . CurrentTable ) if ( ImGuiTable * table = g . CurrentTable )
if ( table - > IsInsideRow ) if ( table - > IsInsideRow )
@ -2672,6 +2672,7 @@ void ImGuiListClipper::End()
if ( ImGuiListClipperData * data = ( ImGuiListClipperData * ) TempData ) if ( ImGuiListClipperData * data = ( ImGuiListClipperData * ) TempData )
{ {
// In theory here we should assert that we are already at the right position, but it seems saner to just seek at the end and not assert/crash the user.
// In theory here we should assert that we are already at the right position, but it seems saner to just seek at the end and not assert/crash the user.
IMGUI_DEBUG_LOG_CLIPPER ( " Clipper: End() in '%s' \n " , g . CurrentWindow - > Name ) ;
if ( ItemsCount > = 0 & & ItemsCount < INT_MAX & & DisplayStart > = 0 ) if ( ItemsCount > = 0 & & ItemsCount < INT_MAX & & DisplayStart > = 0 )
ImGuiListClipper_SeekCursorForItem ( this , ItemsCount ) ; ImGuiListClipper_SeekCursorForItem ( this , ItemsCount ) ;
@ -2697,11 +2698,11 @@ void ImGuiListClipper::ForceDisplayRangeByIndices(int item_min, int item_max)
data - > Ranges . push_back ( ImGuiListClipperRange : : FromIndices ( item_min , item_max ) ) ; data - > Ranges . push_back ( ImGuiListClipperRange : : FromIndices ( item_min , item_max ) ) ;
} }
bool ImGuiListClipper : : Step ( ) static bool ImGuiListClipper_StepInternal ( ImGuiListClipper * clipper )
{ {
ImGuiContext & g = * GImGui ; ImGuiContext & g = * GImGui ;
ImGuiWindow * window = g . CurrentWindow ; ImGuiWindow * window = g . CurrentWindow ;
ImGuiListClipperData * data = ( ImGuiListClipperData * ) TempData ; ImGuiListClipperData * data = ( ImGuiListClipperData * ) clipper - > TempData ;
IM_ASSERT ( data ! = NULL & & " Called ImGuiListClipper::Step() too many times, or before ImGuiListClipper::Begin() ? " ) ; IM_ASSERT ( data ! = NULL & & " Called ImGuiListClipper::Step() too many times, or before ImGuiListClipper::Begin() ? " ) ;
ImGuiTable * table = g . CurrentTable ; ImGuiTable * table = g . CurrentTable ;
@ -2709,17 +2710,16 @@ bool ImGuiListClipper::Step()
ImGui : : TableEndRow ( table ) ; ImGui : : TableEndRow ( table ) ;
// No items
// No items
if ( ItemsCount = = 0 | | GetSkipItemForListClipping ( ) ) if ( clipper - > ItemsCount = = 0 | | GetSkipItemForListClipping ( ) )
return ( void ) End ( ) , false ; return false ;
// While we are in frozen row state, keep displaying items one by one, unclipped
// While we are in frozen row state, keep displaying items one by one, unclipped
// FIXME: Could be stored as a table-agnostic state.
// FIXME: Could be stored as a table-agnostic state.
if ( data - > StepNo = = 0 & & table ! = NULL & & ! table - > IsUnfrozenRows ) if ( data - > StepNo = = 0 & & table ! = NULL & & ! table - > IsUnfrozenRows )
{ {
DisplayStart = data - > ItemsFrozen ; clipper - > DisplayStart = data - > ItemsFrozen ;
DisplayEnd = data - > ItemsFrozen + 1 ; clipper - > DisplayEnd = ImMin ( data - > ItemsFrozen + 1 , clipper - > ItemsCount ) ;
if ( DisplayStart > = ItemsCount ) if ( clipper - > DisplayStart < clipper - > DisplayEnd )
return ( void ) End ( ) , false ;
data - > ItemsFrozen + + ; data - > ItemsFrozen + + ;
return true ; return true ;
} }
@ -2728,15 +2728,13 @@ bool ImGuiListClipper::Step()
bool calc_clipping = false ; bool calc_clipping = false ;
if ( data - > StepNo = = 0 ) if ( data - > StepNo = = 0 )
{ {
StartPosY = window - > DC . CursorPos . y ; clipper - > StartPosY = window - > DC . CursorPos . y ;
if ( ItemsHeight < = 0.0f ) if ( clipper - > ItemsHeight < = 0.0f )
{ {
// Submit the first item (or range) so we can measure its height (generally the first range is 0..1)
// Submit the first item (or range) so we can measure its height (generally the first range is 0..1)
data - > Ranges . push_front ( ImGuiListClipperRange : : FromIndices ( data - > ItemsFrozen , data - > ItemsFrozen + 1 ) ) ; data - > Ranges . push_front ( ImGuiListClipperRange : : FromIndices ( data - > ItemsFrozen , data - > ItemsFrozen + 1 ) ) ;
DisplayStart = ImMax ( data - > Ranges [ 0 ] . Min , data - > ItemsFrozen ) ; clipper - > DisplayStart = ImMax ( data - > Ranges [ 0 ] . Min , data - > ItemsFrozen ) ;
DisplayEnd = ImMin ( data - > Ranges [ 0 ] . Max , ItemsCount ) ; clipper - > DisplayEnd = ImMin ( data - > Ranges [ 0 ] . Max , clipper - > ItemsCount ) ;
if ( DisplayStart = = DisplayEnd )
return ( void ) End ( ) , false ;
data - > StepNo = 1 ; data - > StepNo = 1 ;
return true ; return true ;
} }
@ -2744,29 +2742,29 @@ bool ImGuiListClipper::Step()
} }
// Step 1: Let the clipper infer height from first range
// Step 1: Let the clipper infer height from first range
if ( ItemsHeight < = 0.0f ) if ( clipper - > ItemsHeight < = 0.0f )
{ {
IM_ASSERT ( data - > StepNo = = 1 ) ; IM_ASSERT ( data - > StepNo = = 1 ) ;
if ( table ) if ( table )
IM_ASSERT ( table - > RowPosY1 = = StartPosY & & table - > RowPosY2 = = window - > DC . CursorPos . y ) ; IM_ASSERT ( table - > RowPosY1 = = clipper - > StartPosY & & table - > RowPosY2 = = window - > DC . CursorPos . y ) ;
ItemsHeight = ( window - > DC . CursorPos . y - StartPosY ) / ( float ) ( DisplayEnd - DisplayStart ) ; clipper - > ItemsHeight = ( window - > DC . CursorPos . y - clipper - > StartPosY ) / ( float ) ( clipper - > DisplayEnd - clipper - > DisplayStart ) ;
bool affected_by_floating_point_precision = ImIsFloatAboveGuaranteedIntegerPrecision ( StartPosY ) | | ImIsFloatAboveGuaranteedIntegerPrecision ( window - > DC . CursorPos . y ) ; bool affected_by_floating_point_precision = ImIsFloatAboveGuaranteedIntegerPrecision ( clipper - > StartPosY ) | | ImIsFloatAboveGuaranteedIntegerPrecision ( window - > DC . CursorPos . y ) ;
if ( affected_by_floating_point_precision ) if ( affected_by_floating_point_precision )
ItemsHeight = window - > DC . PrevLineSize . y + g . Style . ItemSpacing . y ; // FIXME: Technically wouldn't allow multi-line entries.
clipper - > ItemsHeight = window - > DC . PrevLineSize . y + g . Style . ItemSpacing . y ; // FIXME: Technically wouldn't allow multi-line entries.
IM_ASSERT ( ItemsHeight > 0.0f & & " Unable to calculate item height! First item hasn't moved the cursor vertically! " ) ; IM_ASSERT ( clipper - > ItemsHeight > 0.0f & & " Unable to calculate item height! First item hasn't moved the cursor vertically! " ) ;
calc_clipping = true ; // If item height had to be calculated, calculate clipping afterwards.
calc_clipping = true ; // If item height had to be calculated, calculate clipping afterwards.
} }
// Step 0 or 1: Calculate the actual ranges of visible elements.
// Step 0 or 1: Calculate the actual ranges of visible elements.
const int already_submitted = DisplayEnd ; const int already_submitted = clipper - > DisplayEnd ;
if ( calc_clipping ) if ( calc_clipping )
{ {
if ( g . LogEnabled ) if ( g . LogEnabled )
{ {
// If logging is active, do not perform any clipping
// If logging is active, do not perform any clipping
data - > Ranges . push_back ( ImGuiListClipperRange : : FromIndices ( 0 , ItemsCount ) ) ; data - > Ranges . push_back ( ImGuiListClipperRange : : FromIndices ( 0 , clipper - > ItemsCount ) ) ;
} }
else else
{ {
@ -2775,7 +2773,7 @@ bool ImGuiListClipper::Step()
if ( is_nav_request ) if ( is_nav_request )
data - > Ranges . push_back ( ImGuiListClipperRange : : FromPositions ( g . NavScoringNoClipRect . Min . y , g . NavScoringNoClipRect . Max . y , 0 , 0 ) ) ; data - > Ranges . push_back ( ImGuiListClipperRange : : FromPositions ( g . NavScoringNoClipRect . Min . y , g . NavScoringNoClipRect . Max . y , 0 , 0 ) ) ;
if ( is_nav_request & & ( g . NavMoveFlags & ImGuiNavMoveFlags_Tabbing ) & & g . NavTabbingDir = = - 1 ) if ( is_nav_request & & ( g . NavMoveFlags & ImGuiNavMoveFlags_Tabbing ) & & g . NavTabbingDir = = - 1 )
data - > Ranges . push_back ( ImGuiListClipperRange : : FromIndices ( ItemsCount - 1 , ItemsCount ) ) ; data - > Ranges . push_back ( ImGuiListClipperRange : : FromIndices ( clipper - > ItemsCount - 1 , clipper - > ItemsCount ) ) ;
// Add focused/active item
// Add focused/active item
ImRect nav_rect_abs = ImGui : : WindowRectRelToAbs ( window , window - > NavRectRel [ 0 ] ) ; ImRect nav_rect_abs = ImGui : : WindowRectRelToAbs ( window , window - > NavRectRel [ 0 ] ) ;
@ -2795,10 +2793,10 @@ bool ImGuiListClipper::Step()
for ( int i = 0 ; i < data - > Ranges . Size ; i + + ) for ( int i = 0 ; i < data - > Ranges . Size ; i + + )
if ( data - > Ranges [ i ] . PosToIndexConvert ) if ( data - > Ranges [ i ] . PosToIndexConvert )
{ {
int m1 = ( int ) ( ( ( double ) data - > Ranges [ i ] . Min - window - > DC . CursorPos . y - data - > LossynessOffset ) / ItemsHeight ) ; int m1 = ( int ) ( ( ( double ) data - > Ranges [ i ] . Min - window - > DC . CursorPos . y - data - > LossynessOffset ) / clipper - > ItemsHeight ) ;
int m2 = ( int ) ( ( ( ( double ) data - > Ranges [ i ] . Max - window - > DC . CursorPos . y - data - > LossynessOffset ) / ItemsHeight ) + 0.999999f ) ; int m2 = ( int ) ( ( ( ( double ) data - > Ranges [ i ] . Max - window - > DC . CursorPos . y - data - > LossynessOffset ) / clipper - > ItemsHeight ) + 0.999999f ) ;
data - > Ranges [ i ] . Min = ImClamp ( already_submitted + m1 + data - > Ranges [ i ] . PosToIndexOffsetMin , already_submitted , ItemsCount - 1 ) ; data - > Ranges [ i ] . Min = ImClamp ( already_submitted + m1 + data - > Ranges [ i ] . PosToIndexOffsetMin , already_submitted , clipper - > ItemsCount - 1 ) ;
data - > Ranges [ i ] . Max = ImClamp ( already_submitted + m2 + data - > Ranges [ i ] . PosToIndexOffsetMax , data - > Ranges [ i ] . Min + 1 , ItemsCount ) ; data - > Ranges [ i ] . Max = ImClamp ( already_submitted + m2 + data - > Ranges [ i ] . PosToIndexOffsetMax , data - > Ranges [ i ] . Min + 1 , clipper - > ItemsCount ) ;
data - > Ranges [ i ] . PosToIndexConvert = false ; data - > Ranges [ i ] . PosToIndexConvert = false ;
} }
ImGuiListClipper_SortAndFuseRanges ( data - > Ranges , data - > StepNo ) ; ImGuiListClipper_SortAndFuseRanges ( data - > Ranges , data - > StepNo ) ;
@ -2807,23 +2805,42 @@ bool ImGuiListClipper::Step()
// Step 0+ (if item height is given in advance) or 1+: Display the next range in line.
// Step 0+ (if item height is given in advance) or 1+: Display the next range in line.
if ( data - > StepNo < data - > Ranges . Size ) if ( data - > StepNo < data - > Ranges . Size )
{ {
DisplayStart = ImMax ( data - > Ranges [ data - > StepNo ] . Min , already_submitted ) ; clipper - > DisplayStart = ImMax ( data - > Ranges [ data - > StepNo ] . Min , already_submitted ) ;
DisplayEnd = ImMin ( data - > Ranges [ data - > StepNo ] . Max , ItemsCount ) ; clipper - > DisplayEnd = ImMin ( data - > Ranges [ data - > StepNo ] . Max , clipper - > ItemsCount ) ;
if ( DisplayStart > already_submitted ) //-V1051
if ( clipper - > DisplayStart > already_submitted ) //-V1051
ImGuiListClipper_SeekCursorForItem ( this , DisplayStart ) ; ImGuiListClipper_SeekCursorForItem ( clipper , clipper - > DisplayStart ) ;
data - > StepNo + + ; data - > StepNo + + ;
return true ; return true ;
} }
// After the last step: Let the clipper validate that we have reached the expected Y position (corresponding to element DisplayEnd),
// After the last step: Let the clipper validate that we have reached the expected Y position (corresponding to element DisplayEnd),
// Advance the cursor to the end of the list and then returns 'false' to end the loop.
// Advance the cursor to the end of the list and then returns 'false' to end the loop.
if ( ItemsCount < INT_MAX ) if ( clipper - > ItemsCount < INT_MAX )
ImGuiListClipper_SeekCursorForItem ( this , ItemsCount ) ; ImGuiListClipper_SeekCursorForItem ( clipper , clipper - > ItemsCount ) ;
End ( ) ;
return false ; return false ;
} }
bool ImGuiListClipper : : Step ( )
{
ImGuiContext & g = * GImGui ;
bool need_items_height = ( ItemsHeight < = 0.0f ) ;
bool ret = ImGuiListClipper_StepInternal ( this ) ;
if ( ret & & ( DisplayStart = = DisplayEnd ) )
ret = false ;
if ( g . CurrentTable & & g . CurrentTable - > IsUnfrozenRows = = false )
IMGUI_DEBUG_LOG_CLIPPER ( " Clipper: Step(): inside frozen table row. \n " ) ;
if ( need_items_height & & ItemsHeight > 0.0f )
IMGUI_DEBUG_LOG_CLIPPER ( " Clipper: Step(): computed ItemsHeight: %.2f. \n " , ItemsHeight ) ;
if ( ret )
IMGUI_DEBUG_LOG_CLIPPER ( " Clipper: Step(): display %d to %d. \n " , DisplayStart , DisplayEnd ) ;
else
IMGUI_DEBUG_LOG_CLIPPER ( " Clipper: Step(): End. \n " ) ;
if ( ! ret )
End ( ) ;
return ret ;
}
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
// [SECTION] STYLING
// [SECTION] STYLING
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
@ -6900,7 +6917,7 @@ bool ImGui::Begin(const char* name, bool* p_open, ImGuiWindowFlags flags)
if ( g . TestEngineHookItems ) if ( g . TestEngineHookItems )
{ {
IM_ASSERT ( window - > IDStack . Size = = 1 ) ; IM_ASSERT ( window - > IDStack . Size = = 1 ) ;
window - > IDStack . Size = 0 ; window - > IDStack . Size = 0 ; // As window->IDStack[0] == window->ID here, make sure TestEngine doesn't erroneously see window as parent of itself.
IMGUI_TEST_ENGINE_ITEM_ADD ( window - > Rect ( ) , window - > ID ) ; IMGUI_TEST_ENGINE_ITEM_ADD ( window - > Rect ( ) , window - > ID ) ;
IMGUI_TEST_ENGINE_ITEM_INFO ( window - > ID , window - > Name , ( g . HoveredWindow = = window ) ? ImGuiItemStatusFlags_HoveredRect : 0 ) ; IMGUI_TEST_ENGINE_ITEM_INFO ( window - > ID , window - > Name , ( g . HoveredWindow = = window ) ? ImGuiItemStatusFlags_HoveredRect : 0 ) ;
window - > IDStack . Size = 1 ; window - > IDStack . Size = 1 ;
@ -8569,17 +8586,17 @@ static const char* GetInputSourceName(ImGuiInputSource source)
IM_ASSERT ( IM_ARRAYSIZE ( input_source_names ) = = ImGuiInputSource_COUNT & & source > = 0 & & source < ImGuiInputSource_COUNT ) ; IM_ASSERT ( IM_ARRAYSIZE ( input_source_names ) = = ImGuiInputSource_COUNT & & source > = 0 & & source < ImGuiInputSource_COUNT ) ;
return input_source_names [ source ] ; return input_source_names [ source ] ;
} }
# endif static void DebugPrintInputEvent ( const char * prefix , const ImGuiInputEvent * e )
/*static void DebugPrintInputEvent(const char* prefix, const ImGuiInputEvent* e)
{ {
if ( e - > Type = = ImGuiInputEventType_MousePos ) { IMGUI_DEBUG_LOG_IO ( " %s: MousePos (%.1f %.1f) \n " , prefix , e - > MousePos . PosX , e - > MousePos . PosY ) ; return ; } ImGuiContext & g = * GImGui ;
if ( e - > Type = = ImGuiInputEventType_MousePos ) { IMGUI_DEBUG_LOG_IO ( " %s: MousePos (%.1f, %.1f) \n " , prefix , e - > MousePos . PosX , e - > MousePos . PosY ) ; return ; }
if ( e - > Type = = ImGuiInputEventType_MouseButton ) { IMGUI_DEBUG_LOG_IO ( " %s: MouseButton %d %s \n " , prefix , e - > MouseButton . Button , e - > MouseButton . Down ? " Down " : " Up " ) ; return ; } if ( e - > Type = = ImGuiInputEventType_MouseButton ) { IMGUI_DEBUG_LOG_IO ( " %s: MouseButton %d %s \n " , prefix , e - > MouseButton . Button , e - > MouseButton . Down ? " Down " : " Up " ) ; return ; }
if ( e - > Type = = ImGuiInputEventType_MouseWheel ) { IMGUI_DEBUG_LOG_IO ( " %s: MouseWheel (%.1f %.1f) \n " , prefix , e - > MouseWheel . WheelX , e - > MouseWheel . WheelY ) ; return ; } if ( e - > Type = = ImGuiInputEventType_MouseWheel ) { IMGUI_DEBUG_LOG_IO ( " %s: MouseWheel (%.1f, %.1f) \n " , prefix , e - > MouseWheel . WheelX , e - > MouseWheel . WheelY ) ; return ; }
if ( e - > Type = = ImGuiInputEventType_Key ) { IMGUI_DEBUG_LOG_IO ( " %s: Key \" %s \" %s \n " , prefix , ImGui : : GetKeyName ( e - > Key . Key ) , e - > Key . Down ? " Down " : " Up " ) ; return ; } if ( e - > Type = = ImGuiInputEventType_Key ) { IMGUI_DEBUG_LOG_IO ( " %s: Key \" %s \" %s \n " , prefix , ImGui : : GetKeyName ( e - > Key . Key ) , e - > Key . Down ? " Down " : " Up " ) ; return ; }
if ( e - > Type = = ImGuiInputEventType_Text ) { IMGUI_DEBUG_LOG_IO ( " %s: Text: %c (U+%08X) \n " , prefix , e - > Text . Char , e - > Text . Char ) ; return ; } if ( e - > Type = = ImGuiInputEventType_Text ) { IMGUI_DEBUG_LOG_IO ( " %s: Text: %c (U+%08X) \n " , prefix , e - > Text . Char , e - > Text . Char ) ; return ; }
if ( e - > Type = = ImGuiInputEventType_Focus ) { IMGUI_DEBUG_LOG_IO ( " %s: AppFocused %d \n " , prefix , e - > AppFocused . Focused ) ; return ; } if ( e - > Type = = ImGuiInputEventType_Focus ) { IMGUI_DEBUG_LOG_IO ( " %s: AppFocused %d \n " , prefix , e - > AppFocused . Focused ) ; return ; }
} */ }
# endif
// Process input queue
// Process input queue
// We always call this with the value of 'bool g.IO.ConfigInputTrickleEventQueue'.
// We always call this with the value of 'bool g.IO.ConfigInputTrickleEventQueue'.
@ -8602,13 +8619,14 @@ void ImGui::UpdateInputEvents(bool trickle_fast_inputs)
int event_n = 0 ; int event_n = 0 ;
for ( ; event_n < g . InputEventsQueue . Size ; event_n + + ) for ( ; event_n < g . InputEventsQueue . Size ; event_n + + )
{ {
const ImGuiInputEvent * e = & g . InputEventsQueue [ event_n ] ; ImGuiInputEvent * e = & g . InputEventsQueue [ event_n ] ;
if ( e - > Type = = ImGuiInputEventType_MousePos ) if ( e - > Type = = ImGuiInputEventType_MousePos )
{ {
ImVec2 event_pos ( e - > MousePos . PosX , e - > MousePos . PosY ) ; ImVec2 event_pos ( e - > MousePos . PosX , e - > MousePos . PosY ) ;
if ( IsMousePosValid ( & event_pos ) ) if ( IsMousePosValid ( & event_pos ) )
event_pos = ImVec2 ( ImFloorSigned ( event_pos . x ) , ImFloorSigned ( event_pos . y ) ) ; // Apply same flooring as UpdateMouseInputs()
event_pos = ImVec2 ( ImFloorSigned ( event_pos . x ) , ImFloorSigned ( event_pos . y ) ) ; // Apply same flooring as UpdateMouseInputs()
if ( io . MousePos . x ! = event_pos . x | | io . MousePos . y ! = event_pos . y ) e - > IgnoredAsSame = ( io . MousePos . x = = event_pos . x & & io . MousePos . y = = event_pos . y ) ;
if ( ! e - > IgnoredAsSame )
{ {
// Trickling Rule: Stop processing queued events if we already handled a mouse button change
// Trickling Rule: Stop processing queued events if we already handled a mouse button change
if ( trickle_fast_inputs & & ( mouse_button_changed ! = 0 | | mouse_wheeled | | key_changed | | text_inputted ) ) if ( trickle_fast_inputs & & ( mouse_button_changed ! = 0 | | mouse_wheeled | | key_changed | | text_inputted ) )
@ -8621,7 +8639,8 @@ void ImGui::UpdateInputEvents(bool trickle_fast_inputs)
{ {
const ImGuiMouseButton button = e - > MouseButton . Button ; const ImGuiMouseButton button = e - > MouseButton . Button ;
IM_ASSERT ( button > = 0 & & button < ImGuiMouseButton_COUNT ) ; IM_ASSERT ( button > = 0 & & button < ImGuiMouseButton_COUNT ) ;
if ( io . MouseDown [ button ] ! = e - > MouseButton . Down ) e - > IgnoredAsSame = ( io . MouseDown [ button ] = = e - > MouseButton . Down ) ;
if ( ! e - > IgnoredAsSame )
{ {
// Trickling Rule: Stop processing queued events if we got multiple action on the same button
// Trickling Rule: Stop processing queued events if we got multiple action on the same button
if ( trickle_fast_inputs & & ( ( mouse_button_changed & ( 1 < < button ) ) | | mouse_wheeled ) ) if ( trickle_fast_inputs & & ( ( mouse_button_changed & ( 1 < < button ) ) | | mouse_wheeled ) )
@ -8632,7 +8651,8 @@ void ImGui::UpdateInputEvents(bool trickle_fast_inputs)
} }
else if ( e - > Type = = ImGuiInputEventType_MouseWheel ) else if ( e - > Type = = ImGuiInputEventType_MouseWheel )
{ {
if ( e - > MouseWheel . WheelX ! = 0.0f | | e - > MouseWheel . WheelY ! = 0.0f ) e - > IgnoredAsSame = ( e - > MouseWheel . WheelX = = 0.0f & & e - > MouseWheel . WheelY = = 0.0f ) ;
if ( ! e - > IgnoredAsSame )
{ {
// Trickling Rule: Stop processing queued events if we got multiple action on the event
// Trickling Rule: Stop processing queued events if we got multiple action on the event
if ( trickle_fast_inputs & & ( mouse_moved | | mouse_button_changed ! = 0 ) ) if ( trickle_fast_inputs & & ( mouse_moved | | mouse_button_changed ! = 0 ) )
@ -8652,7 +8672,8 @@ void ImGui::UpdateInputEvents(bool trickle_fast_inputs)
IM_ASSERT ( key ! = ImGuiKey_None ) ; IM_ASSERT ( key ! = ImGuiKey_None ) ;
const int keydata_index = ( key - ImGuiKey_KeysData_OFFSET ) ; const int keydata_index = ( key - ImGuiKey_KeysData_OFFSET ) ;
ImGuiKeyData * keydata = & io . KeysData [ keydata_index ] ; ImGuiKeyData * keydata = & io . KeysData [ keydata_index ] ;
if ( keydata - > Down ! = e - > Key . Down | | keydata - > AnalogValue ! = e - > Key . AnalogValue ) e - > IgnoredAsSame = ( keydata - > Down = = e - > Key . Down & & keydata - > AnalogValue = = e - > Key . AnalogValue ) ;
if ( ! e - > IgnoredAsSame )
{ {
// Trickling Rule: Stop processing queued events if we got multiple action on the same button
// Trickling Rule: Stop processing queued events if we got multiple action on the same button
if ( trickle_fast_inputs & & keydata - > Down ! = e - > Key . Down & & ( key_changed_mask . TestBit ( keydata_index ) | | text_inputted | | mouse_button_changed ! = 0 ) ) if ( trickle_fast_inputs & & keydata - > Down ! = e - > Key . Down & & ( key_changed_mask . TestBit ( keydata_index ) | | text_inputted | | mouse_button_changed ! = 0 ) )
@ -8693,7 +8714,10 @@ void ImGui::UpdateInputEvents(bool trickle_fast_inputs)
{ {
// We intentionally overwrite this and process lower, in order to give a chance
// We intentionally overwrite this and process lower, in order to give a chance
// to multi-viewports backends to queue AddFocusEvent(false) + AddFocusEvent(true) in same frame.
// to multi-viewports backends to queue AddFocusEvent(false) + AddFocusEvent(true) in same frame.
io . AppFocusLost = ! e - > AppFocused . Focused ; const bool focus_lost = ! e - > AppFocused . Focused ;
e - > IgnoredAsSame = ( io . AppFocusLost = = focus_lost ) ;
if ( ! e - > IgnoredAsSame )
io . AppFocusLost = focus_lost ;
} }
else else
{ {
@ -8707,9 +8731,11 @@ void ImGui::UpdateInputEvents(bool trickle_fast_inputs)
g . InputEventsTrail . push_back ( g . InputEventsQueue [ n ] ) ; g . InputEventsTrail . push_back ( g . InputEventsQueue [ n ] ) ;
// [DEBUG]
// [DEBUG]
/*if (event_n != 0)
# ifndef IMGUI_DISABLE_DEBUG_TOOLS
if ( event_n ! = 0 & & ( g . DebugLogFlags & ImGuiDebugLogFlags_EventIO ) )
for ( int n = 0 ; n < g . InputEventsQueue . Size ; n + + ) for ( int n = 0 ; n < g . InputEventsQueue . Size ; n + + )
DebugPrintInputEvent ( n < event_n ? " Processed " : " Remaining " , & g . InputEventsQueue [ n ] ) ; */ DebugPrintInputEvent ( n < event_n ? ( g . InputEventsQueue [ n ] . IgnoredAsSame ? " Processed (Same) " : " Processed " ) : " Remaining " , & g . InputEventsQueue [ n ] ) ;
# endif
// Remaining events will be processed on the next frame
// Remaining events will be processed on the next frame
if ( event_n = = g . InputEventsQueue . Size ) if ( event_n = = g . InputEventsQueue . Size )
@ -9175,6 +9201,9 @@ ImVec2 ImGui::GetCursorScreenPos()
return window - > DC . CursorPos ; return window - > DC . CursorPos ;
} }
// 2022/08/05: Setting cursor position also extend boundaries (via modifying CursorMaxPos) used to compute window size, group size etc.
// I believe this was is a judicious choice but it's probably being relied upon (it has been the case since 1.31 and 1.50)
// It would be sane if we requested user to use SetCursorPos() + Dummy(ImVec2(0,0)) to extend CursorMaxPos...
void ImGui : : SetCursorScreenPos ( const ImVec2 & pos ) void ImGui : : SetCursorScreenPos ( const ImVec2 & pos )
{ {
ImGuiWindow * window = GetCurrentWindow ( ) ; ImGuiWindow * window = GetCurrentWindow ( ) ;
@ -17668,8 +17697,7 @@ static void SetPlatformImeDataFn_DefaultImpl(ImGuiViewport* viewport, ImGuiPlatf
if ( hwnd = = 0 ) if ( hwnd = = 0 )
return ; return ;
: : ImmAssociateContextEx ( hwnd , NULL , data - > WantVisible ? IACE_DEFAULT : 0 ) ; //::ImmAssociateContextEx(hwnd, NULL, data->WantVisible ? IACE_DEFAULT : 0);
if ( HIMC himc = : : ImmGetContext ( hwnd ) ) if ( HIMC himc = : : ImmGetContext ( hwnd ) )
{ {
COMPOSITIONFORM composition_form = { } ; COMPOSITIONFORM composition_form = { } ;
@ -18915,6 +18943,8 @@ void ImGui::ShowDebugLogWindow(bool* p_open)
SameLine ( ) ; CheckboxFlags ( " Focus " , & g . DebugLogFlags , ImGuiDebugLogFlags_EventFocus ) ; SameLine ( ) ; CheckboxFlags ( " Focus " , & g . DebugLogFlags , ImGuiDebugLogFlags_EventFocus ) ;
SameLine ( ) ; CheckboxFlags ( " Popup " , & g . DebugLogFlags , ImGuiDebugLogFlags_EventPopup ) ; SameLine ( ) ; CheckboxFlags ( " Popup " , & g . DebugLogFlags , ImGuiDebugLogFlags_EventPopup ) ;
SameLine ( ) ; CheckboxFlags ( " Nav " , & g . DebugLogFlags , ImGuiDebugLogFlags_EventNav ) ; SameLine ( ) ; CheckboxFlags ( " Nav " , & g . DebugLogFlags , ImGuiDebugLogFlags_EventNav ) ;
SameLine ( ) ; CheckboxFlags ( " Clipper " , & g . DebugLogFlags , ImGuiDebugLogFlags_EventClipper ) ;
SameLine ( ) ; CheckboxFlags ( " IO " , & g . DebugLogFlags , ImGuiDebugLogFlags_EventIO ) ;
SameLine ( ) ; CheckboxFlags ( " Docking " , & g . DebugLogFlags , ImGuiDebugLogFlags_EventDocking ) ; SameLine ( ) ; CheckboxFlags ( " Docking " , & g . DebugLogFlags , ImGuiDebugLogFlags_EventDocking ) ;
SameLine ( ) ; CheckboxFlags ( " Viewport " , & g . DebugLogFlags , ImGuiDebugLogFlags_EventViewport ) ; SameLine ( ) ; CheckboxFlags ( " Viewport " , & g . DebugLogFlags , ImGuiDebugLogFlags_EventViewport ) ;
ocornut
ago%!(EXTRA string=3 years)