Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(303)

Unified Diff: ui/app_list/views/app_list_view.cc

Issue 894203004: Add a proper shadow to the experimental app list search box. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@make_doodle_clickable
Patch Set: address_comments Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/app_list/DEPS ('k') | ui/app_list/views/app_list_view_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/app_list/views/app_list_view.cc
diff --git a/ui/app_list/views/app_list_view.cc b/ui/app_list/views/app_list_view.cc
index e2d3e095d7634c6cfb9b4c98a322f152a5cf627c..f2083749f9ab8f7652ca6e3123777a8f1a78193e 100644
--- a/ui/app_list/views/app_list_view.cc
+++ b/ui/app_list/views/app_list_view.cc
@@ -45,6 +45,7 @@
#include "ui/aura/window.h"
#include "ui/aura/window_tree_host.h"
#include "ui/views/bubble/bubble_window_targeter.h"
+#include "ui/wm/core/masked_window_targeter.h"
#if defined(OS_WIN)
#include "ui/base/win/shell.h"
#endif
@@ -109,6 +110,29 @@ class AppListOverlayView : public views::View {
DISALLOW_COPY_AND_ASSIGN(AppListOverlayView);
};
+#if defined(USE_AURA)
+// An event targeter for the search box widget which will ignore events that
+// are on the search box's shadow.
+class SearchBoxWindowTargeter : public wm::MaskedWindowTargeter {
+ public:
+ explicit SearchBoxWindowTargeter(views::View* search_box)
+ : wm::MaskedWindowTargeter(search_box->GetWidget()->GetNativeWindow()),
+ search_box_(search_box) {}
+ ~SearchBoxWindowTargeter() override {}
+
+ private:
+ // wm::MaskedWindowTargeter:
+ bool GetHitTestMask(aura::Window* window, gfx::Path* mask) const override {
+ mask->addRect(gfx::RectToSkRect(search_box_->GetContentsBounds()));
+ return true;
+ }
+
+ views::View* search_box_;
+
+ DISALLOW_COPY_AND_ASSIGN(SearchBoxWindowTargeter);
+};
+#endif
+
} // namespace
// An animation observer to hide the view at the end of the animation.
@@ -426,6 +450,13 @@ void AppListView::InitChildWidgets() {
search_box_widget_->Init(search_box_widget_params);
search_box_widget_->SetContentsView(search_box_view_);
+#if defined(USE_AURA)
+ // Mouse events on the search box shadow should not be captured.
+ aura::Window* window = search_box_widget_->GetNativeWindow();
+ window->SetEventTargeter(scoped_ptr<ui::EventTargeter>(
+ new SearchBoxWindowTargeter(search_box_view_)));
+#endif
+
app_list_main_view_->contents_view()->Layout();
}
« no previous file with comments | « ui/app_list/DEPS ('k') | ui/app_list/views/app_list_view_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698