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

Unified Diff: chrome/browser/ui/gtk/zoom_bubble_gtk.cc

Issue 10907168: [gtk] When mouse is inside of an auto-closing zoom bubble and the zoom is (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: estade@ review Created 8 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
« no previous file with comments | « chrome/browser/ui/gtk/zoom_bubble_gtk.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/gtk/zoom_bubble_gtk.cc
diff --git a/chrome/browser/ui/gtk/zoom_bubble_gtk.cc b/chrome/browser/ui/gtk/zoom_bubble_gtk.cc
index f8a130a6b0ac07aa8150ceb9e47889e9a372d010..dac8505a54921354215cc00604a566440c8cebec 100644
--- a/chrome/browser/ui/gtk/zoom_bubble_gtk.cc
+++ b/chrome/browser/ui/gtk/zoom_bubble_gtk.cc
@@ -69,6 +69,7 @@ ZoomBubbleGtk::ZoomBubbleGtk(GtkWidget* anchor,
TabContents* tab_contents,
bool auto_close)
: auto_close_(auto_close),
+ mouse_inside_(false),
tab_contents_(tab_contents) {
GtkThemeService* theme_service =
GtkThemeService::GetFrom(Profile::FromBrowserContext(
@@ -156,16 +157,17 @@ void ZoomBubbleGtk::Refresh() {
}
void ZoomBubbleGtk::StartTimerIfNecessary() {
- if (auto_close_) {
- if (timer_.IsRunning()) {
- timer_.Reset();
- } else {
- timer_.Start(
- FROM_HERE,
- base::TimeDelta::FromMilliseconds(kBubbleCloseDelay),
- this,
- &ZoomBubbleGtk::CloseBubble);
- }
+ if (!auto_close_ || mouse_inside_)
+ return;
+
+ if (timer_.IsRunning()) {
+ timer_.Reset();
+ } else {
+ timer_.Start(
+ FROM_HERE,
+ base::TimeDelta::FromMilliseconds(kBubbleCloseDelay),
+ this,
+ &ZoomBubbleGtk::CloseBubble);
}
}
@@ -194,12 +196,14 @@ void ZoomBubbleGtk::OnSetDefaultLinkClick(GtkWidget* widget) {
gboolean ZoomBubbleGtk::OnMouseEnter(GtkWidget* widget,
GdkEventCrossing* event) {
+ mouse_inside_ = true;
StopTimerIfNecessary();
return FALSE;
}
gboolean ZoomBubbleGtk::OnMouseLeave(GtkWidget* widget,
GdkEventCrossing* event) {
+ mouse_inside_ = false;
StartTimerIfNecessary();
return FALSE;
}
« no previous file with comments | « chrome/browser/ui/gtk/zoom_bubble_gtk.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698