← Back to branch summary

~3v1n0/unity/overlay-border-scale

« back to all changes in this revision

Viewing changes to launcher/StandaloneSwitcher.cpp

  • Committer: Gord Allott
  • Date: 2012-05-07 22:28:17 UTC
  • mto: This revision was merged to the branch mainline in revision 2352.
  • Revision ID: gord.allott@canonical.com-20120507222817-0ffnpkrod3j9xpwj
shortcuts and unityshell working woo

Show diffs side-by-side

added added

removed removed

Lines of Context:
launcher/StandaloneSwitcher.cpp
101
101
{
102
102
  view->Hide();
103
103
 
104
 
  std::vector<AbstractLauncherIcon*> icons;
 
104
  std::vector<nux::ObjectPtr<AbstractLauncherIcon>> icons;
105
105
  for (int i = 0; i < self->GetValue (); i++)
106
 
    icons.push_back(new MockLauncherIcon());
 
106
    icons.push_back(nux::ObjectPtr<AbstractLauncherIcon>(new MockLauncherIcon()));
107
107
 
108
108
  view->Show(ShowMode::ALL, SortMode::FOCUS_ORDER, false, icons);
109
109
}
129
129
 
130
130
  view = new Controller();
131
131
  view->timeout_length = 0;
132
 
  view->SetWorkspace(nux::Geometry(0, 0, 900, 600));
 
132
  view->SetWorkspace(nux::Geometry(0, 0, 900, 600), 0);
133
133
 
134
134
  layout->SetContentDistribution(nux::eStackCenter);
135
135
  layout->SetHorizontalExternalMargin (10);
136
136
  nux::GetWindowThread()->SetLayout(layout);
137
137
 
138
 
  std::vector<AbstractLauncherIcon*> icons;
 
138
  std::vector<nux::ObjectPtr<AbstractLauncherIcon>> icons;
139
139
  for (int i = 0; i < 9; i++)
140
 
    icons.push_back(new MockLauncherIcon());
 
140
    icons.push_back(nux::ObjectPtr<AbstractLauncherIcon>(new MockLauncherIcon()));
141
141
 
142
142
  view->Show(ShowMode::ALL, SortMode::FOCUS_ORDER, false, icons);
143
143
 
291
291
  
292
292
  gtk_init(&argc, &argv);
293
293
 
294
 
  dbus_g_thread_init();
295
 
 
296
294
  nux::NuxInitialize(0);
297
295
 
298
296
  BackgroundEffectHelper::blur_type = unity::BLUR_ACTIVE;