~azzar1/unity/fix-1028810

« back to all changes in this revision

Viewing changes to panel/PanelController.cpp

  • Committer: Andrea Azzarone
  • Date: 2012-08-22 13:14:18 UTC
  • mfrom: (2516.1.92 unity)
  • Revision ID: azzaronea@gmail.com-20120822131418-mrfwx82k39xnvl9e
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
256
256
      window->SetBackgroundColor(nux::Color(0.0f, 0.0f, 0.0f, 0.0f));
257
257
      window->ShowWindow(true);
258
258
      window->EnableInputWindow(true, panel::window_title, false, false);
259
 
      window->InputWindowEnableStruts(true);
260
259
      window->SetGeometry(geo);
261
260
      window->SetMinMaxSize(geo.width, geo.height);
262
261
      window->SetLayout(layout);
 
262
      window->InputWindowEnableStruts(true);
263
263
 
264
264
      windows_.push_back(window);
265
265