Make the App Info Dialog appear modal

ui/app_list/views/app_list_view.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/app_list/views/app_list_view.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/strings/string_util.h"
@@ skipping 10 matching lines @@
 #include "ui/app_list/views/app_list_view_observer.h"
 #include "ui/app_list/views/apps_container_view.h"
 #include "ui/app_list/views/contents_view.h"
 #include "ui/app_list/views/search_box_view.h"
 #include "ui/app_list/views/signin_view.h"
 #include "ui/app_list/views/speech_view.h"
 #include "ui/base/ui_base_switches.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/layer_animation_observer.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
+#include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/insets.h"
 #include "ui/gfx/path.h"
 #include "ui/gfx/skia_util.h"
 #include "ui/views/bubble/bubble_frame_view.h"
 #include "ui/views/bubble/bubble_window_targeter.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/widget/widget.h"
 
@@ skipping 30 matching lines @@
           switches::kDisableDwmComposition)) {
     return false;
   }
 #elif defined(OS_LINUX) && !defined(OS_CHROMEOS)
   // Shadows are not supported on (non-ChromeOS) Linux.
   return false;
 #endif
   return true;
 }
 
+// An background for a view that appears as a colored rounded rectangle with the

[tapted, 2014/05/21 03:40:57]

nit: An -> A

[sashab, 2014/05/22 07:20:21]

Oops :) Done.

+// given radius and the same size as the target view.
+class ColoredRoundRectBackground : public views::Background {
+ public:
+  ColoredRoundRectBackground(int corner_radius, SkColor color)
+      : corner_radius_(corner_radius), color_(color) {};
+  virtual ~ColoredRoundRectBackground() {};
+
+  virtual void Paint(gfx::Canvas* canvas, views::View* view) const OVERRIDE {

[tapted, 2014/05/21 03:40:57]

nit: // Overridden from views::Background:

[sashab, 2014/05/22 07:20:21]

Done.

+    SkPaint paint;
+    paint.setStyle(SkPaint::kFill_Style);
+    paint.setColor(color_);

[tapted, 2014/05/21 03:40:57]

this class is pretty specialized - I don't think there's any need to feed color_
through the constructor / data members, since it is always white.

Unless there are plans to use this outside the app list, I'd call this class
`AppListOverlayBackground`, and just use SK_ColorWHITE here.

[sashab, 2014/05/22 07:20:21]

Yup, agreed. Done.

+    canvas->DrawRoundRect(view->GetContentsBounds(), corner_radius_, paint);
+  }
+
+ private:
+  const int corner_radius_;
+  const SkColor color_;
+};

[tapted, 2014/05/21 03:40:57]

nit: DISALLOW_COPY_AND_ASSIGN(..)

[sashab, 2014/05/22 07:20:21]

Done.

+
 }  // namespace
 
 // An animation observer to hide the view at the end of the animation.
 class HideViewAnimationObserver : public ui::ImplicitAnimationObserver {
  public:
   HideViewAnimationObserver()
       : frame_(NULL),
         target_(NULL) {
   }
 
@@ skipping 29 matching lines @@
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 // AppListView:
 
 AppListView::AppListView(AppListViewDelegate* delegate)
     : delegate_(delegate),
       app_list_main_view_(NULL),
       signin_view_(NULL),
       speech_view_(NULL),
+      overlay_view_(NULL),
       animation_observer_(new HideViewAnimationObserver()) {
   CHECK(delegate);
 
   delegate_->AddObserver(this);
   delegate_->GetSpeechUI()->AddObserver(this);
 }
 
 AppListView::~AppListView() {
   delegate_->GetSpeechUI()->RemoveObserver(this);
   delegate_->RemoveObserver(this);
@@ skipping 47 matching lines @@
 
 void AppListView::Close() {
   app_list_main_view_->Close();
   delegate_->Dismiss();
 }
 
 void AppListView::UpdateBounds() {
   SizeToContents();
 }
 
+void AppListView::ShowAppListOverlay(bool visible) {
+  DCHECK(overlay_view_);
+  overlay_view_->SetVisible(visible);
+}
+
 bool AppListView::ShouldCenterWindow() const {
   return delegate_->ShouldCenterWindow();
 }
 
 gfx::Size AppListView::GetPreferredSize() const {
   return app_list_main_view_->GetPreferredSize();
 }
 
 void AppListView::Paint(gfx::Canvas* canvas, const views::CullSet& cull_set) {
   views::BubbleDelegateView::Paint(canvas, cull_set);
@@ skipping 120 matching lines @@
       app_list_main_view_));
 
   // On non-aura the bubble has two widgets, and it's possible for the border
   // to be shown independently in odd situations. Explicitly hide the bubble
   // widget to ensure that any WM_WINDOWPOSCHANGED messages triggered by the
   // window manager do not have the SWP_SHOWWINDOW flag set which would cause
   // the border to be shown. See http://crbug.com/231687 .
   GetWidget()->Hide();
 #endif
 
+  // The contents corner radius is 1px smaller than border corner radius. We
+  // need this for platforms where the bubble doesn't have a shadow (such as
+  // Linux aura and Windows XP). When the bubble does have a shadow, the view is

[tapted, 2014/05/21 03:40:57]

I don't really understand this comment - seems to imply that on Linux and WinXP
the dialog isn't modal, but on other platforms (with a shadow) it is. But it
doesn't really describe how the shadow influences the corner radius. Also views
aren't really modal (windows are). Can you clarify it a bit?

There's also a `SupportsShadow()` function - the comment suggests it might be
useful, but it's not used.

[sashab, 2014/05/22 07:20:21]

I didn't see SupportsShadow(). Thank you for that - updated the comment and used
SupportsShadow().

+  // modal to the dialog, so a solid background is sufficient.
+  const int kOverlayCornerRadius =
+      GetBubbleFrameView()->bubble_border()->GetBorderCornerRadius() - 1;
+  const float kOverlayOpacity = 0.75f;
+
+  // To make the overlay view, construct a regular view with a solid white
+  // background, rather than a white rectangle on it. This is because we need
+  // overlay_view_ to be drawn to its own layer (so it appears correctly in the
+  // foreground).
+  overlay_view_ = new views::View();
+  overlay_view_->SetPaintToLayer(true);
+  overlay_view_->set_background(
+      new ColoredRoundRectBackground(kOverlayCornerRadius, SK_ColorWHITE));
+  overlay_view_->layer()->SetOpacity(kOverlayOpacity);
+  overlay_view_->SetBoundsRect(bounds());

[tapted, 2014/05/21 03:40:57]

Since this is a child view, it shouldn't use the superview position+size given
by bounds() (e.g. if the parent was not positioned at (0,0) in its parent, this
would offset |overlay_view_| the same amount within |this|). I think you want
GetContentsBounds() instead of bounds().

[sashab, 2014/05/22 07:20:21]

Ahh yup - this was only working because it was positioned at (0,0) in it's
parent. Fixed.

+  overlay_view_->SetVisible(false);
+  AddChildView(overlay_view_);
+
   if (delegate_)
     delegate_->ViewInitialized();
 }
 
 void AppListView::OnBeforeBubbleWidgetInit(
     views::Widget::InitParams* params,
     views::Widget* widget) const {
 #if defined(USE_AURA) && !defined(OS_CHROMEOS)
   if (delegate_ && delegate_->ForceNativeDesktop())
     params->native_widget = new views::DesktopNativeWidgetAura(widget);
@@ skipping 164 matching lines @@
 #else
   speech_view_->SetVisible(recognizing);
   app_list_main_view_->SetVisible(!recognizing);
 
   // Needs to schedule paint of AppListView itself, to repaint the background.
   GetBubbleFrameView()->SchedulePaint();
 #endif
 }
 
 }  // namespace app_list