diff options
| author | Andrea Azzarone <azzaronea@gmail.com> | 2012-10-18 09:39:39 +0000 | 
|---|---|---|
| committer | Tarmac <> | 2012-10-18 09:39:39 +0000 | 
| commit | cd395b699a9a439497eea095401a764db91c2a29 (patch) | |
| tree | 463999d5308434dab29bd3d0e043e5b2393fb006 | |
| parent | b41d84804edb5aabe017b79d3265dbb1fb09acad (diff) | |
| parent | 4111c2095eaa0895ec731f040885a9b5cd142a5e (diff) | |
Remove dead code in unityshell.cpp. Approved by Marco Trevisan (TreviƱo).
(bzr r2860)
| -rw-r--r-- | plugins/unityshell/src/unityshell.cpp | 36 | ||||
| -rw-r--r-- | plugins/unityshell/src/unityshell.h | 2 | 
2 files changed, 0 insertions, 38 deletions
| diff --git a/plugins/unityshell/src/unityshell.cpp b/plugins/unityshell/src/unityshell.cpp index 000a826a2..08c91a643 100644 --- a/plugins/unityshell/src/unityshell.cpp +++ b/plugins/unityshell/src/unityshell.cpp @@ -1241,42 +1241,6 @@ bool UnityWindow::handleEvent(XEvent *event)  return handled;  } -bool UnityScreen::shellCouldBeHidden(CompOutput const& output) -{ - std::vector<Window> const& nuxwins(nux::XInputWindow::NativeHandleList()); - - // Loop through windows from front to back - CompWindowList const& wins = screen->windows(); - for ( CompWindowList::const_reverse_iterator r = wins.rbegin() - ; r != wins.rend() - ; ++r - ) - { - CompWindow* w = *r; - - /* - * The shell is hidden if there exists any window that fully covers - * the output and is in front of all Nux windows on that output. - */ - if (w->isMapped() && - !(w->state () & CompWindowStateHiddenMask) && - w->geometry().contains(output)) - { - return true; - } - else - { - for (Window n : nuxwins) - { - if (w->id() == n && output.intersects(w->geometry())) - return false; - } - } - } - - return false; -} -  /* called whenever we need to repaint parts of the screen */  bool UnityScreen::glPaintOutput(const GLScreenPaintAttrib& attrib,  const GLMatrix& transform, diff --git a/plugins/unityshell/src/unityshell.h b/plugins/unityshell/src/unityshell.h index 506888535..2c45485df 100644 --- a/plugins/unityshell/src/unityshell.h +++ b/plugins/unityshell/src/unityshell.h @@ -112,8 +112,6 @@ public:  void damageRegion(const CompRegion ®ion); - bool shellCouldBeHidden(CompOutput const& output); -  /* paint on top of all windows if we could not find a window  * to paint underneath */  bool glPaintOutput(const GLScreenPaintAttrib&, | 
