summaryrefslogtreecommitdiffstats
path: root/views/window
diff options
context:
space:
mode:
authorsadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-23 00:55:28 +0000
committersadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-23 00:55:28 +0000
commitf0b6b4881e24a1e7cd9524c4e381382c14bde1f1 (patch)
treea003cdb87339224ae24f3dd39f8d3fc9a8f1c8fc /views/window
parent1edd9e76f6dac6bcdbdebf51eceb7b6665fe52fa (diff)
downloadchromium_src-f0b6b4881e24a1e7cd9524c4e381382c14bde1f1.zip
chromium_src-f0b6b4881e24a1e7cd9524c4e381382c14bde1f1.tar.gz
chromium_src-f0b6b4881e24a1e7cd9524c4e381382c14bde1f1.tar.bz2
Refactoring of cursor usage (primarily for linux).
Add API to WebCursor to return a native-cursor, and implementation for windows, linux and mac. For linux: Move gtk_util::GetCursor into gfx:: namespace. Also, get rid of ref/unref'ing the cursors from everywhere. Instead, do almost all of it in one place (in gfx). Also, show proper cursors for web-pages with touchui=1 (i.e. add support for updating cursor in RenderWidgetHostViewViews). Review URL: http://codereview.chromium.org/5110010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67034 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/window')
-rw-r--r--views/window/window_gtk.cc9
1 files changed, 3 insertions, 6 deletions
diff --git a/views/window/window_gtk.cc b/views/window/window_gtk.cc
index 3d7f788..d59d7a5 100644
--- a/views/window/window_gtk.cc
+++ b/views/window/window_gtk.cc
@@ -7,6 +7,7 @@
#include "gfx/rect.h"
#include "base/i18n/rtl.h"
#include "base/utf_string_conversions.h"
+#include "gfx/gtk_util.h"
#include "gfx/path.h"
#include "views/event.h"
#include "views/screen.h"
@@ -329,9 +330,7 @@ gboolean WindowGtk::OnMotionNotify(GtkWidget* widget, GdkEventMotion* event) {
non_client_view_->NonClientHitTest(gfx::Point(x, y));
if (hittest_code != HTCLIENT) {
GdkCursorType cursor_type = HitTestCodeToGdkCursorType(hittest_code);
- GdkCursor* cursor = gdk_cursor_new(cursor_type);
- gdk_window_set_cursor(widget->window, cursor);
- gdk_cursor_destroy(cursor);
+ gdk_window_set_cursor(widget->window, gfx::GetCursor(cursor_type));
}
return WidgetGtk::OnMotionNotify(widget, event);
@@ -362,9 +361,7 @@ gboolean WindowGtk::OnWindowStateEvent(GtkWidget* widget,
}
gboolean WindowGtk::OnLeaveNotify(GtkWidget* widget, GdkEventCrossing* event) {
- GdkCursor* cursor = gdk_cursor_new(GDK_LEFT_PTR);
- gdk_window_set_cursor(widget->window, cursor);
- gdk_cursor_destroy(cursor);
+ gdk_window_set_cursor(widget->window, gfx::GetCursor(GDK_LEFT_PTR));
return WidgetGtk::OnLeaveNotify(widget, event);
}