summaryrefslogtreecommitdiff
path: root/unity-shared
diff options
authorMarco Trevisan (Treviño) <mail@3v1n0.net>2013-10-30 14:29:38 -0700
committerMarco Trevisan (Treviño) <mail@3v1n0.net>2013-10-30 14:29:38 -0700
commitf8752d5339a798f0fdfed01f10a96eac1eea31d3 (patch)
treef3a5ca833c8fb0990b8fcbe93ac2796ff60fa1c2 /unity-shared
parent810c7f8ed50d537ab17d6021784bd218a6204452 (diff)
Unity: use IsIntersecting when possible
(bzr r3347.3.13)
Diffstat (limited to 'unity-shared')
-rw-r--r--unity-shared/PlacesOverlayVScrollBar.cpp3
-rw-r--r--unity-shared/PluginAdapter.cpp2
2 files changed, 2 insertions, 3 deletions
diff --git a/unity-shared/PlacesOverlayVScrollBar.cpp b/unity-shared/PlacesOverlayVScrollBar.cpp
index fc5d2daac..e16f4b848 100644
--- a/unity-shared/PlacesOverlayVScrollBar.cpp
+++ b/unity-shared/PlacesOverlayVScrollBar.cpp
@@ -209,9 +209,8 @@ void PlacesOverlayVScrollBar::CheckIfThumbIsInsideSlider()
{
nux::Geometry const& slider_geo = _slider->GetAbsoluteGeometry();
nux::Geometry const& thumb_geo = overlay_window_->GetThumbGeometry();
- nux::Geometry const& intersection = (thumb_geo.Intersect(slider_geo));
- if (!intersection.IsNull())
+ if (thumb_geo.IsIntersecting(slider_geo))
{
ResetConnector();
overlay_window_->ThumbInsideSlider();
diff --git a/unity-shared/PluginAdapter.cpp b/unity-shared/PluginAdapter.cpp
index b233f3067..34bead63d 100644
--- a/unity-shared/PluginAdapter.cpp
+++ b/unity-shared/PluginAdapter.cpp
@@ -573,7 +573,7 @@ bool PluginAdapter::IsWindowObscured(Window window_id) const
&& sibling->isMapped()
&& sibling->isViewable()
&& (sibling->state() & MAXIMIZE_STATE) == MAXIMIZE_STATE
- && !GetWindowGeometry(sibling->id()).Intersect(win_geo).IsNull())
+ && GetWindowGeometry(sibling->id()).IsIntersecting(win_geo))
{
return true;
}