~tatokis/unity/gcc-72-errors

« back to all changes in this revision

Viewing changes to unity-shared/PluginAdapter.h

  • Committer: handsome_feng
  • Date: 2016-01-15 01:41:04 UTC
  • mfrom: (4067 unity)
  • mto: This revision was merged to the branch mainline in revision 4073.
  • Revision ID: 445865575@qq.com-20160115014104-i62hh5373ut0knfu
merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
23
23
/* Compiz */
24
24
#include <core/core.h>
25
25
#include <core/atoms.h>
 
26
#include <scale/scale.h>
26
27
 
27
28
#include <NuxCore/Property.h>
28
29
 
180
181
 
181
182
  int WorkspaceCount() const;
182
183
 
 
184
  void SetCurrentViewport(nux::Point const&) override;
183
185
  nux::Point GetCurrentViewport() const override;
184
186
  void SetViewportSize(int horizontal, int vertical) override;
185
187
  int GetViewportHSize() const override;
214
216
  bool IsCurrentViewportEmpty() const;
215
217
 
216
218
  CompScreen* m_Screen;
 
219
  ScaleScreen* _scale_screen;
217
220
  MultiActionList m_ExpoActionList;
218
221
  MultiActionList m_ScaleActionList;
219
222
 
220
223
  float _coverage_area_before_automaximize;
221
224
  bool _spread_state;
 
225
  bool _spread_requested_state;
222
226
  bool _spread_windows_state;
223
227
  bool _expo_state;
224
228
  bool _vp_switch_started;