Merge lp:~unity-team/unity/fixes-2011-04-14 into lp:unity

[Neil J. Patel]

Bugs linked

[Mirco Müller (macslow)]

Approve.

review: Approve

=== modified file 'src/Launcher.cpp'
=== modified file 'src/PanelMenuView.cpp'
--- src/PanelMenuView.cpp	2011-04-12 14:34:08 +0000
+++ src/PanelMenuView.cpp	2011-04-14 14:06:55 +0000
@@ -311,7 +311,18 @@
   }
   else
   {
-    if ((_is_inside || _last_active_view || _show_now_activated) && _entries.size ())
+    bool have_valid_entries = false;
+    std::vector<PanelIndicatorObjectEntryView *>::iterator it, eit = _entries.end ();
+
+    for (it = _entries.begin (); it != eit; ++it)
+    {
+      IndicatorObjectEntryProxy *proxy = (*it)->_proxy;
+
+      if (proxy->icon_visible || proxy->label_visible)
+        have_valid_entries = true;
+    }
+
+    if ((_is_inside || _last_active_view || _show_now_activated) && have_valid_entries)
     {
       if (_gradient_texture == NULL)
       {
@@ -683,7 +694,7 @@
 PanelMenuView::OnEntryRemoved(IndicatorObjectEntryProxy *proxy)
 {
   std::vector<PanelIndicatorObjectEntryView *>::iterator it;
-  
+ 
   for (it = _entries.begin(); it != _entries.end(); it++)
   {
     PanelIndicatorObjectEntryView *view = static_cast<PanelIndicatorObjectEntryView *> (*it);
@@ -721,6 +732,7 @@
 PanelMenuView::OnActiveWindowChanged (BamfView *old_view,
                                       BamfView *new_view)
 {
+  _show_now_activated = false;
   _is_maximized = false;
   _active_xid = 0;
   if (_active_moved_id)
@@ -734,7 +746,10 @@
     _is_maximized = WindowManager::Default ()->IsWindowMaximized (xid);
     nux::Geometry geo = WindowManager::Default ()->GetWindowGeometry (xid);
 
-    _we_control_active = UScreen::GetDefault ()->GetMonitorGeometry (_monitor).IsPointInside (geo.x + (geo.width/2), geo.y);
+    if (bamf_window_get_window_type (window) == BAMF_WINDOW_DESKTOP)
+      _we_control_active = true;
+    else
+      _we_control_active = UScreen::GetDefault ()->GetMonitorGeometry (_monitor).IsPointInside (geo.x + (geo.width/2), geo.y);
 
     if (_decor_map.find (xid) == _decor_map.end ())
     {
 
=== modified file 'src/PanelView.cpp'
--- src/PanelView.cpp	2011-04-06 17:53:41 +0000
+++ src/PanelView.cpp	2011-04-14 14:06:55 +0000
@@ -127,6 +127,8 @@
 void
 PanelView::Draw (nux::GraphicsEngine& GfxContext, bool force_draw)
 {
+  UpdateBackground ();
+
   GfxContext.PushClippingRectangle (GetGeometry() );
 
   gPainter.PushDrawLayer (GfxContext, GetGeometry (), _bg_layer);
@@ -164,9 +166,6 @@
 long
 PanelView::PostLayoutManagement (long LayoutResult)
 {
-  // I'm imagining this is a good as time as any to update the background
-  UpdateBackground ();
-
   return nux::View::PostLayoutManagement (LayoutResult);
 }
 
 
=== modified file 'src/PlacesEmptyView.cpp'
--- src/PlacesEmptyView.cpp	2011-03-20 18:15:16 +0000
+++ src/PlacesEmptyView.cpp	2011-04-14 14:06:55 +0000
@@ -25,9 +25,12 @@
 PlacesEmptyView::PlacesEmptyView ()
 : nux::View (NUX_TRACKER_LOCATION)
 {
+  PlacesStyle *style = PlacesStyle::GetDefault ();
+
   SetLayout (new nux::HLayout (NUX_TRACKER_LOCATION));
 
   _text = new nux::StaticCairoText ("");
+  _text->SetMaximumWidth (style->GetTileWidth () * style->GetDefaultNColumns ());
   _text->SetTextEllipsize (nux::StaticCairoText::NUX_ELLIPSIZE_END);
   _text->SetTextAlignment (nux::StaticCairoText::NUX_ALIGN_CENTRE);
   _text->SetTextVerticalAlignment (nux::StaticCairoText::NUX_ALIGN_CENTRE);
 
=== modified file 'src/PlacesHomeView.cpp'
=== modified file 'src/PlacesView.cpp'
--- src/PlacesView.cpp	2011-04-14 09:10:30 +0000
+++ src/PlacesView.cpp	2011-04-14 14:06:55 +0000
@@ -120,6 +120,7 @@
 
   // Register for all the events
   UBusServer *ubus = ubus_server_get_default ();
+<<<<<<< TREE
 
   // This is a nice time to Connect () the Places as it's hopefully fast enough to be avaiable
   // by the time the user starts typing (home screen doesn't require initial connection)
@@ -138,6 +139,20 @@
   _ubus_handles[3] = ubus_server_register_interest (ubus, UBUS_PLACE_VIEW_QUEUE_DRAW,
                                                     (UBusCallback)&PlacesView::OnPlaceViewQueueDrawNeeded,
                                                     this);
+=======
+  _ubus_handles[0] = ubus_server_register_interest (ubus, UBUS_PLACE_ENTRY_ACTIVATE_REQUEST,
+                                                    (UBusCallback)place_entry_activate_request,
+                                                    this);
+  _ubus_handles[1] = ubus_server_register_interest (ubus, UBUS_PLACE_VIEW_CLOSE_REQUEST,
+                                                    (UBusCallback)&PlacesView::CloseRequest,
+                                                    this);
+  _ubus_handles[2] = ubus_server_register_interest (ubus, UBUS_PLACE_TILE_ACTIVATE_REQUEST,
+                                                    (UBusCallback)&PlacesView::OnResultActivated,
+                                                    this);
+  _ubus_handles[3] = ubus_server_register_interest (ubus, UBUS_PLACE_VIEW_QUEUE_DRAW,
+                                                    (UBusCallback)&PlacesView::OnPlaceViewQueueDrawNeeded,
+                                                    this);
+>>>>>>> MERGE-SOURCE
 
   _icon_loader = IconLoader::GetDefault ();
 
 
=== modified file 'src/PlacesView.h'
--- src/PlacesView.h	2011-04-13 16:06:03 +0000
+++ src/PlacesView.h	2011-04-14 14:06:55 +0000
@@ -174,9 +174,14 @@
   bool  _pending_activation;
 
   bool  _search_empty;
+<<<<<<< TREE
   bool  _places_connected;
   guint _home_button_hover;
   guint _ubus_handles[4];
+=======
+
+  guint _ubus_handles[4];
+>>>>>>> MERGE-SOURCE
 };
 
 #endif // PANEL_HOME_BUTTON_H
 
=== modified file 'src/PluginAdapter.cpp'
--- src/PluginAdapter.cpp	2011-04-08 17:53:28 +0000
+++ src/PluginAdapter.cpp	2011-04-14 14:06:55 +0000
@@ -393,6 +393,7 @@
     for (CompWindow *sibling = window->next; sibling != NULL; sibling = sibling->next)
     {
       if (sibling->defaultViewport () == window_vp
+          && !sibling->minimized ()
           && (sibling->state () & MAXIMIZE_STATE) == MAXIMIZE_STATE)
         return true;
     }