← Back to branch summary

~azzar1/unity/scale-left-padding

« back to all changes in this revision

Viewing changes to plugins/unityshell/src/PanelController.cpp

  • Committer: Andrea Azzarone
  • Date: 2011-12-19 22:18:53 UTC
  • mfrom: (1792 unity)
  • mto: This revision was merged to the branch mainline in revision 1833.
  • Revision ID: azzaronea@gmail.com-20111219221853-wyy8fqwxk78s85ct
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/unityshell/src/PanelController.cpp
55
55
 
56
56
  float opacity() const;
57
57
 
 
58
  void SetMenuShowTimings(int fadein, int fadeout, int discovery,
 
59
                          int discovery_fadein, int discovery_fadeout);
 
60
 
58
61
private:
59
62
  unity::PanelView* ViewForWindow(nux::BaseWindow* window);
60
63
  void OnScreenChanged(int primary_monitor, std::vector<nux::Geometry>& monitors);
68
71
  float opacity_;
69
72
  bool opacity_maximized_toggle_;
70
73
  bool open_menu_start_received_;
 
74
  int menus_fadein_;
 
75
  int menus_fadeout_;
 
76
  int menus_discovery_;
 
77
  int menus_discovery_fadein_;
 
78
  int menus_discovery_fadeout_;
71
79
};
72
80
 
73
81
 
147
155
{
148
156
  opacity_maximized_toggle_ = enabled;
149
157
 
150
 
  for (auto window : windows_)
 
158
  for (auto window: windows_)
151
159
  {
152
160
    ViewForWindow(window)->SetOpacityMaximizedToggle(opacity_maximized_toggle_);
153
161
  }
154
162
}
155
163
 
 
164
void Controller::Impl::SetMenuShowTimings(int fadein, int fadeout, int discovery,
 
165
                                          int discovery_fadein, int discovery_fadeout)
 
166
{
 
167
  menus_fadein_ = fadein;
 
168
  menus_fadeout_ = fadeout;
 
169
  menus_discovery_ = discovery;
 
170
  menus_discovery_fadein_ = discovery_fadein;
 
171
  menus_discovery_fadeout_ = discovery_fadeout;
 
172
 
 
173
  for (auto window: windows_)
 
174
  {
 
175
    ViewForWindow(window)->SetMenuShowTimings(fadein, fadeout, discovery,
 
176
                                              discovery_fadein, discovery_fadeout);
 
177
  }
 
178
}
 
179
 
156
180
void Controller::Impl::QueueRedraw()
157
181
{
158
182
  for (auto window: windows_)
216
240
      view->SetMaximumHeight(24);
217
241
      view->SetOpacity(opacity_);
218
242
      view->SetOpacityMaximizedToggle(opacity_maximized_toggle_);
 
243
      view->SetMenuShowTimings(menus_fadein_, menus_fadeout_, menus_discovery_,
 
244
                               menus_discovery_fadein_, menus_discovery_fadeout_);
219
245
      view->SetPrimary(i == primary_monitor);
220
246
      view->SetMonitor(i);
221
247
 
301
327
  pimpl->SetOpacityMaximizedToggle(enabled);
302
328
}
303
329
 
 
330
void Controller::SetMenuShowTimings(int fadein, int fadeout, int discovery,
 
331
                                    int discovery_fadein, int discovery_fadeout)
 
332
{
 
333
  pimpl->SetMenuShowTimings(fadein, fadeout, discovery, discovery_fadein, discovery_fadeout);
 
334
}
 
335
 
304
336
void Controller::QueueRedraw()
305
337
{
306
338
  pimpl->QueueRedraw();