summaryrefslogtreecommitdiffstats
path: root/chrome/browser/gtk/browser_actions_toolbar_gtk.cc
diff options
context:
space:
mode:
authorpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-27 01:00:27 +0000
committerpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-27 01:00:27 +0000
commitd851106a4c47f58ff714c4f4e2d05b41490947ac (patch)
tree34166dbdd4d219dfe32c591a973d87fd25fa7fc2 /chrome/browser/gtk/browser_actions_toolbar_gtk.cc
parent596650852ec1016cf7c5af66ed4236c9cb546c05 (diff)
downloadchromium_src-d851106a4c47f58ff714c4f4e2d05b41490947ac.zip
chromium_src-d851106a4c47f58ff714c4f4e2d05b41490947ac.tar.gz
chromium_src-d851106a4c47f58ff714c4f4e2d05b41490947ac.tar.bz2
Make the resize gripper invisible.
BUG=50107 TEST=Resize gripper nest to browser actions container should no longer appear Review URL: http://codereview.chromium.org/3052011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53732 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gtk/browser_actions_toolbar_gtk.cc')
-rw-r--r--chrome/browser/gtk/browser_actions_toolbar_gtk.cc28
1 files changed, 2 insertions, 26 deletions
diff --git a/chrome/browser/gtk/browser_actions_toolbar_gtk.cc b/chrome/browser/gtk/browser_actions_toolbar_gtk.cc
index b60489a..2a864c5 100644
--- a/chrome/browser/gtk/browser_actions_toolbar_gtk.cc
+++ b/chrome/browser/gtk/browser_actions_toolbar_gtk.cc
@@ -350,7 +350,6 @@ BrowserActionsToolbarGtk::BrowserActionsToolbarGtk(Browser* browser)
resize_animation_(this),
desired_width_(0),
start_width_(0),
- draw_gripper_(false),
method_factory_(this) {
ExtensionsService* extension_service = profile_->GetExtensionsService();
// The |extension_service| can be NULL in Incognito.
@@ -754,21 +753,6 @@ gboolean BrowserActionsToolbarGtk::OnGripperMotionNotify(
gboolean BrowserActionsToolbarGtk::OnGripperExpose(GtkWidget* gripper,
GdkEventExpose* expose) {
- if (!draw_gripper_)
- return TRUE;
-
- cairo_t* cr = gdk_cairo_create(GDK_DRAWABLE(expose->window));
-
- CairoCachedSurface* surface = theme_provider_->GetSurfaceNamed(
- IDR_RESIZE_GRIPPER, gripper);
- gfx::Point center = gfx::Rect(gripper->allocation).CenterPoint();
- center.Offset(-surface->Width() / 2, -surface->Height() / 2);
- surface->SetSource(cr, center.x(), center.y());
- gdk_cairo_rectangle(cr, &expose->area);
- cairo_fill(cr);
-
- cairo_destroy(cr);
-
return TRUE;
}
@@ -781,18 +765,13 @@ gboolean BrowserActionsToolbarGtk::OnGripperEnterNotify(
GtkWidget* gripper, GdkEventCrossing* event) {
gdk_window_set_cursor(gripper->window,
gtk_util::GetCursor(GDK_SB_H_DOUBLE_ARROW));
- draw_gripper_ = true;
-
return FALSE;
}
gboolean BrowserActionsToolbarGtk::OnGripperLeaveNotify(
GtkWidget* gripper, GdkEventCrossing* event) {
- if (!(event->state & GDK_BUTTON1_MASK)) {
+ if (!(event->state & GDK_BUTTON1_MASK))
gdk_window_set_cursor(gripper->window, NULL);
- draw_gripper_ = false;
- }
-
return FALSE;
}
@@ -801,11 +780,8 @@ gboolean BrowserActionsToolbarGtk::OnGripperButtonRelease(
gfx::Rect gripper_rect(0, 0,
gripper->allocation.width, gripper->allocation.height);
gfx::Point release_point(event->x, event->y);
- if (!gripper_rect.Contains(release_point)) {
+ if (!gripper_rect.Contains(release_point))
gdk_window_set_cursor(gripper->window, NULL);
- draw_gripper_ = false;
- gtk_widget_queue_draw(gripper);
- }
// After the user resizes the toolbar, we want to smartly resize it to be
// the perfect size to fit the buttons.