summaryrefslogtreecommitdiff
path: root/plugins
diff options
authorMarco Trevisan (Treviño) <mail@3v1n0.net>2011-10-11 12:59:31 +0200
committerMarco Trevisan (Treviño) <mail@3v1n0.net>2011-10-11 12:59:31 +0200
commit195d921c41af0fadc1517a2c4b6c2290b2bb48e9 (patch)
tree896bb73e0eeba316418467f0c9605d9c7f3b26ee /plugins
parent2e51a4bb2d486f29db9f987133de202af8bccbe7 (diff)
PanelView: always sync geometries for indicators.
Don't sync menus only if they aren't available in the current panel window for the given monitor. (bzr r1693.2.7)
Diffstat (limited to 'plugins')
-rw-r--r--plugins/unityshell/src/PanelView.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/plugins/unityshell/src/PanelView.cpp b/plugins/unityshell/src/PanelView.cpp
index d143ee3e1..1464c88a9 100644
--- a/plugins/unityshell/src/PanelView.cpp
+++ b/plugins/unityshell/src/PanelView.cpp
@@ -272,7 +272,7 @@ PanelView::Draw(nux::GraphicsEngine& GfxContext, bool force_draw)
GfxContext.PopClippingRectangle();
- if (_needs_geo_sync && _menu_view->GetControlsActive())
+ if (_needs_geo_sync)
{
SyncGeometries();
_needs_geo_sync = false;
@@ -624,7 +624,9 @@ PanelView::SyncGeometries()
indicator::EntryLocationMap locations;
std::string panel_id = GetName() + boost::lexical_cast<std::string>(_monitor);
- _menu_view->GetGeometryForSync(locations);
+ if (_menu_view->GetControlsActive())
+ _menu_view->GetGeometryForSync(locations);
+
_indicators->GetGeometryForSync(locations);
_remote->SyncGeometries(panel_id, locations);
}