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

Unified Diff: ash/common/system/chromeos/palette/palette_tray.cc

Issue 2303963002: cros/ash: If the partial magnifier is active, do not consume input events if over palette views. (Closed)
Patch Set: Address comments Created 4 years, 3 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
Index: ash/common/system/chromeos/palette/palette_tray.cc
diff --git a/ash/common/system/chromeos/palette/palette_tray.cc b/ash/common/system/chromeos/palette/palette_tray.cc
index 80ecc3bb8117eda76ff491066ee15d2dd80d69b0..99af79ba3a3ae8d149dc621077e00f38ed63548b 100644
--- a/ash/common/system/chromeos/palette/palette_tray.cc
+++ b/ash/common/system/chromeos/palette/palette_tray.cc
@@ -220,6 +220,15 @@ bool PaletteTray::ShowPalette() {
return true;
}
+bool PaletteTray::ContainsPointInScreen(const gfx::Point& point) {
+ if (icon_ && icon_->GetBoundsInScreen().Contains(point.x(), point.y()))
James Cook 2016/09/06 16:16:31 nit: You can just do Contains(point). Sorry I didn
jdufault 2016/09/07 22:39:06 Done; I was looking for that override but somehow
+ return true;
+
+ return bubble_ &&
+ bubble_->bubble_view()->GetBoundsInScreen().Contains(point.x(),
+ point.y());
+}
+
void PaletteTray::AddToolsToView(views::View* host) {
std::vector<PaletteToolView> views = palette_tool_manager_->CreateViews();
for (const PaletteToolView& view : views)

Powered by Google App Engine
This is Rietveld 408576698