← Back to branch summary

~mial/ubuntu/oneiric/unity/bug-791810

« back to all changes in this revision

Viewing changes to tests/TestSwitcher.cpp

  • Committer: Jay Taoko
  • Date: 2011-10-21 03:44:20 UTC
  • mfrom: (1721.1.4 unity-porting-nux20)
  • Revision ID: jay.taoko@canonical.com-20111021034420-ucz8y104ztr15944
Ported Unity to Nux 2.0

- The Button class in Nux no longer has properties. Refer to Nux API for more details on the signals and functions of that class

- ProcessEvent member functions have been removed (remnant of the former event architecture)

- Removed former Focus API

- ComputeLayout2 has been renamed ComputeContentSize

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/TestSwitcher.cpp
141
141
 
142
142
  view->GetView ()->render_boxes = true;
143
143
 
144
 
  nux::CheckBox* flipping_check = new nux::CheckBox(TEXT("Enable Automatic Flipping"), NUX_TRACKER_LOCATION);
 
144
  nux::CheckBox* flipping_check = new nux::CheckBox(TEXT("Enable Automatic Flipping"), false, NUX_TRACKER_LOCATION);
145
145
  flipping_check->SetMaximumWidth(250);
146
 
  flipping_check->SetMaximumHeight(30);
147
 
  flipping_check->active.changed.connect (sigc::ptr_fun (OnFlippingChanged));
 
146
  flipping_check->state_change.connect (sigc::ptr_fun (OnFlippingChanged));
148
147
  layout->AddView(flipping_check, 1, nux::eRight, nux::eFull);
149
148
 
150
149
 
261
260
  control_buttons_layout->SetHorizontalInternalMargin (10);
262
261
 
263
262
  nux::Button* prev_button = new nux::Button ("Previous", NUX_TRACKER_LOCATION);
264
 
  prev_button->activated.connect (sigc::ptr_fun (OnPreviousClicked));
 
263
  prev_button->state_change.connect (sigc::ptr_fun (OnPreviousClicked));
265
264
  control_buttons_layout->AddView(prev_button, 1, nux::eLeft, nux::eFull);
266
265
 
267
266
  nux::Button* next_button = new nux::Button ("Next", NUX_TRACKER_LOCATION);
268
 
  next_button->activated.connect (sigc::ptr_fun (OnNextClicked));
 
267
  next_button->state_change.connect (sigc::ptr_fun (OnNextClicked));
269
268
  control_buttons_layout->AddView(next_button, 1, nux::eRight, nux::eFull);
270
269
 
271
270
  nux::Button* detail_button = new nux::Button ("Detail", NUX_TRACKER_LOCATION);
272
 
  detail_button->activated.connect (sigc::ptr_fun (OnDetailClicked));
 
271
  detail_button->state_change.connect (sigc::ptr_fun (OnDetailClicked));
273
272
  control_buttons_layout->AddView(detail_button, 1, nux::eRight, nux::eFull);
274
273
 
275
274
  layout->AddView(control_buttons_layout, 1, nux::eRight, nux::eFull);