summaryrefslogtreecommitdiffstats
path: root/www/chromium/files/patch-ui_views_controls_label.cc
diff options
context:
space:
mode:
Diffstat (limited to 'www/chromium/files/patch-ui_views_controls_label.cc')
-rw-r--r--www/chromium/files/patch-ui_views_controls_label.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/www/chromium/files/patch-ui_views_controls_label.cc b/www/chromium/files/patch-ui_views_controls_label.cc
index a8e2477..47a6cd8 100644
--- a/www/chromium/files/patch-ui_views_controls_label.cc
+++ b/www/chromium/files/patch-ui_views_controls_label.cc
@@ -1,15 +1,15 @@
---- ui/views/controls/label.cc.orig 2017-03-09 20:04:49 UTC
+--- ui/views/controls/label.cc.orig 2017-04-19 19:06:54 UTC
+++ ui/views/controls/label.cc
-@@ -521,7 +521,7 @@ bool Label::OnMousePressed(const ui::Mou
+@@ -549,7 +549,7 @@ bool Label::OnMousePressed(const ui::Mou
GetFocusManager()->SetFocusedView(this);
}
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
- if (event.IsOnlyMiddleMouseButton() && GetFocusManager())
+ if (event.IsOnlyMiddleMouseButton() && GetFocusManager() && !had_focus)
GetFocusManager()->SetFocusedView(this);
#endif
-@@ -685,7 +685,7 @@ bool Label::PasteSelectionClipboard() {
+@@ -725,7 +725,7 @@ bool Label::PasteSelectionClipboard() {
}
void Label::UpdateSelectionClipboard() {
OpenPOWER on IntegriCloud