@@ -108,13 +108,8 @@ bool ImGuiEx::Canvas::Begin(ImGuiID id, const ImVec2& size)
108
108
109
109
UpdateViewTransformPosition ();
110
110
111
- # if IMGUI_VERSION_NUM > 18415
112
111
if (ImGui::IsClippedEx (m_WidgetRect, id))
113
112
return false ;
114
- # else
115
- if (ImGui::IsClippedEx (m_WidgetRect, id, false ))
116
- return false ;
117
- # endif
118
113
119
114
// Save current channel, so we can assert when user
120
115
// call canvas API with different one.
@@ -375,13 +370,8 @@ void ImGuiEx::Canvas::SaveViewportState()
375
370
m_WindowPosBackup = window->Pos ;
376
371
m_ViewportPosBackup = viewport->Pos ;
377
372
m_ViewportSizeBackup = viewport->Size ;
378
- # if IMGUI_VERSION_NUM > 18002
379
373
m_ViewportWorkPosBackup = viewport->WorkPos ;
380
374
m_ViewportWorkSizeBackup = viewport->WorkSize ;
381
- # else
382
- m_ViewportWorkOffsetMinBackup = viewport->WorkOffsetMin ;
383
- m_ViewportWorkOffsetMaxBackup = viewport->WorkOffsetMax ;
384
- # endif
385
375
# endif
386
376
}
387
377
@@ -394,13 +384,8 @@ void ImGuiEx::Canvas::RestoreViewportState()
394
384
window->Pos = m_WindowPosBackup;
395
385
viewport->Pos = m_ViewportPosBackup;
396
386
viewport->Size = m_ViewportSizeBackup;
397
- # if IMGUI_VERSION_NUM > 18002
398
387
viewport->WorkPos = m_ViewportWorkPosBackup;
399
388
viewport->WorkSize = m_ViewportWorkSizeBackup;
400
- # else
401
- viewport->WorkOffsetMin = m_ViewportWorkOffsetMinBackup;
402
- viewport->WorkOffsetMax = m_ViewportWorkOffsetMaxBackup;
403
- # endif
404
389
# endif
405
390
}
406
391
@@ -463,13 +448,8 @@ void ImGuiEx::Canvas::EnterLocalSpace()
463
448
viewport->Pos = viewport_min;
464
449
viewport->Size = viewport_max - viewport_min;
465
450
466
- # if IMGUI_VERSION_NUM > 18002
467
451
viewport->WorkPos = m_ViewportWorkPosBackup * m_View.InvScale ;
468
452
viewport->WorkSize = m_ViewportWorkSizeBackup * m_View.InvScale ;
469
- # else
470
- viewport->WorkOffsetMin = m_ViewportWorkOffsetMinBackup * m_View.InvScale ;
471
- viewport->WorkOffsetMax = m_ViewportWorkOffsetMaxBackup * m_View.InvScale ;
472
- # endif
473
453
# endif
474
454
475
455
// Clip rectangle in parent canvas space and move it to local space.
0 commit comments