← Back to branch summary

~brandontschaefer/nux/xim-tests

« back to all changes in this revision

Viewing changes to Nux/LayeredLayout.cpp

  • Committer: Brandon Schaefer
  • Date: 2012-10-19 00:23:27 UTC
  • mfrom: (637.2.55 trunk)
  • Revision ID: brandon.schaefer@canonical.com-20121019002327-60e88jn3k8chi7gt
* Merged trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
Nux/LayeredLayout.cpp
59
59
    m_child_draw_queued(false)
60
60
  {
61
61
    m_ContentStacking = eStackLeft;
62
 
    OnChildQueueDraw.connect(sigc::mem_fun(this, &LayeredLayout::ChildQueueDraw));
 
62
    child_queue_draw.connect(sigc::mem_fun(this, &LayeredLayout::ChildQueueDraw));
63
63
  }
64
64
 
65
65
  LayeredLayout::~LayeredLayout()
163
163
      Layout *layout = NUX_STATIC_CAST(Layout *, _area);
164
164
      layout->ProcessDraw(graphics_engine, force_draw);
165
165
    }
166
 
    else if (_area->IsArea())
167
 
    {
168
 
      InputArea *area = NUX_STATIC_CAST(InputArea *, _area);
169
 
      area->OnDraw(graphics_engine, force_draw);
170
 
    }
171
166
  }
172
167
 
173
168
  void LayeredLayout::ProcessDraw(GraphicsEngine &graphics_engine, bool force_draw)
204
199
    }
205
200
 
206
201
    graphics_engine.PopClippingRectangle();
207
 
    _queued_draw = false;
 
202
    draw_cmd_queued_ = false;
208
203
  }
209
204
 
210
205
  Area* LayeredLayout::FindAreaUnderMouse(const Point& mouse_position, NuxEventType event_type)
241
236
  }
242
237
 
243
238
  void LayeredLayout::AddLayout(Layout                *layout,
244
 
                                unsigned int           stretch_factor,
245
 
                                MinorDimensionPosition positioning,
246
 
                                MinorDimensionSize     extend,
247
 
                                float                  percentage)
 
239
                                unsigned int           /* stretch_factor */,
 
240
                                MinorDimensionPosition /* positioning */,
 
241
                                MinorDimensionSize     /* extend */,
 
242
                                float                  /* percentage */)
248
243
  {
249
244
    AddLayer(layout);
250
245
  }
251
246
 
252
247
  void LayeredLayout::AddView(Area                  *view,
253
 
                              unsigned int           stretch_factor,
254
 
                              MinorDimensionPosition positioning,
255
 
                              MinorDimensionSize     extend,
256
 
                              float                  percentage)
 
248
                              unsigned int           /* stretch_factor */,
 
249
                              MinorDimensionPosition /* positioning */,
 
250
                              MinorDimensionSize     /* extend */,
 
251
                              float                  /* percentage */)
257
252
  {
258
253
    AddLayer(view);
259
254
  }
271
266
    Layout::Clear();
272
267
  }
273
268
 
274
 
  void LayeredLayout::ChildQueueDraw(Area *area)
 
269
  void LayeredLayout::ChildQueueDraw(Area * /* area */)
275
270
  {
276
271
    m_child_draw_queued = true;
277
272
  }
278
273
 
279
 
  void LayeredLayout::ChildVisibilityChanged(Area *area, bool visible)
 
274
  void LayeredLayout::ChildVisibilityChanged(Area * /* area */, bool /* visible */)
280
275
  {
281
276
    QueueDraw();
282
277
  }