← Back to branch summary

~tatokis/unity/gcc-72-errors

« back to all changes in this revision

Viewing changes to dash/ResultView.cpp

Merged with trunk. Reverted autopilot changes

Show diffs side-by-side

added added

removed removed

Lines of Context:
dash/ResultView.cpp
60
60
 
61
61
ResultView::~ResultView()
62
62
{
 
63
  for( auto wrapper: introspectable_children_)
 
64
  {
 
65
    delete wrapper.second;
 
66
  }
63
67
  introspectable_children_.clear();
64
 
  RemoveAllChildren(&ResultView::ChildResultDestructor);
65
68
 
66
69
  for (ResultIterator it(GetIteratorAtRow(0)); !it.IsLast(); ++it)
67
70
  {
189
192
 
190
193
void ResultView::OnEnableRenderToTexture(bool enable_render_to_texture)
191
194
{
192
 
  if (!enable_render_to_texture) 
 
195
  if (!enable_render_to_texture)
193
196
  {
194
197
    result_textures_.clear();
195
198
  }
230
233
  graphics_engine.PushModelViewMatrix(nux::Matrix4::TRANSLATE(-offset_rect.x, -offset_rect.y, 0));
231
234
 
232
235
  ProcessDraw(graphics_engine, true);
233
 
  
 
236
 
234
237
  graphics_engine.PopModelViewMatrix();
235
238
  graphics::PopOffscreenRenderTarget();
236
239
 
238
241
}
239
242
 
240
243
void ResultView::UpdateRenderTextures()
241
 
{ 
 
244
{
242
245
  if (!enable_texture_render)
243
246
    return;
244
247
 
250
253
    result_texture->abs_geo.x = root_geo.x;
251
254
    result_texture->abs_geo.y = root_geo.y;
252
255
    result_texture->abs_geo.width = GetWidth();
253
 
    result_texture->abs_geo.height = GetHeight();     
 
256
    result_texture->abs_geo.height = GetHeight();
254
257
  }
255
258
  else
256
259
  {
272
275
    .add("expanded", expanded);
273
276
}
274
277
 
275
 
void ResultView::ChildResultDestructor(debug::Introspectable* child)
276
 
{
277
 
  delete child;
278
 
}
279
 
 
280
278
debug::Introspectable::IntrospectableList ResultView::GetIntrospectableChildren()
281
279
{
282
280
  // Because the children are in fact wrappers for the results, we can't just re-crate them every time the
323
321
    if (existing_results.find(child_iter->first) == existing_results.end())
324
322
    {
325
323
      // delete and remove the child from the map.
326
 
      ResultView::ChildResultDestructor(child_iter->second);
327
 
      introspectable_children_.erase(child_iter++);
 
324
      delete child_iter->second;
 
325
      child_iter = introspectable_children_.erase(child_iter);
328
326
    }
329
327
    else
330
328
    {