diff options
| author | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2013-10-22 01:50:02 +0200 |
|---|---|---|
| committer | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2013-10-22 01:50:02 +0200 |
| commit | d3d3df8a9ff5df7fdef0d40c518b4e31ae5ddb56 (patch) | |
| tree | e8b6ff589314447586ab16835479319063e60ef2 /launcher | |
| parent | 63b7e242516061aa00873b512452d2281069fbab (diff) | |
LauncherIcon: some cleanup to the header, move GetCenterForMonitor to protected
(bzr r3566.5.6)
Diffstat (limited to 'launcher')
| -rw-r--r-- | launcher/LauncherIcon.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/launcher/LauncherIcon.h b/launcher/LauncherIcon.h index b5f57a5ba..779eb709e 100644 --- a/launcher/LauncherIcon.h +++ b/launcher/LauncherIcon.h @@ -92,8 +92,6 @@ public: nux::Point3 GetSavedCenter(int monitor); - std::pair<int, nux::Point3> GetCenterForMonitor(int monitor) const; - int SortPriority(); virtual WindowList Windows() { return WindowList(); } @@ -211,6 +209,8 @@ public: protected: std::vector<nux::Point3> GetCenters(); + std::pair<int, nux::Point3> GetCenterForMonitor(int monitor) const; + std::string GetName() const; void AddProperties(GVariantBuilder* builder); @@ -296,7 +296,8 @@ protected: bool IsActionArgValid(ActionArg const&); - inline nux::animation::AnimateValue<float>& GetQuirkAnimation(Quirk quirk, int monitor) const + typedef nux::animation::AnimateValue<float> Animation; + inline Animation& GetQuirkAnimation(Quirk quirk, int monitor) const { return *_quirk_animations[monitor][unsigned(quirk)]; } @@ -305,8 +306,6 @@ protected: static int _current_theme_is_mono; private: - typedef nux::animation::AnimateValue<float> Animation; - IconType _icon_type; nux::ObjectPtr<Tooltip> _tooltip; @@ -334,7 +333,7 @@ private: bool _allow_quicklist_to_show; std::vector<nux::Point3> _center; - std::bitset<std::size_t(monitors::MAX)> _has_visible_window; + std::bitset<monitors::MAX> _has_visible_window; std::vector<std::bitset<std::size_t(Quirk::LAST)>> _quirks; std::vector<std::vector<std::shared_ptr<Animation>>> _quirk_animations; std::vector<nux::Point3> _last_stable; |