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

Unified Diff: views/widget/widget_gtk.cc

Issue 215053: Fix code to get widget position on screen. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/widget/widget_gtk.cc
===================================================================
--- views/widget/widget_gtk.cc (revision 26698)
+++ views/widget/widget_gtk.cc (working copy)
@@ -51,19 +51,19 @@
// Returns the position of a widget on screen.
static void GetWidgetPositionOnScreen(GtkWidget* widget, int* x, int *y) {
- while (widget) {
- if (GTK_IS_WINDOW(widget)) {
- int window_x, window_y;
- gtk_window_get_position(GTK_WINDOW(widget), &window_x, &window_y);
- *x += window_x;
- *y += window_y;
- return;
- }
- // Not a window.
- *x += widget->allocation.x;
- *y += widget->allocation.y;
- widget = gtk_widget_get_parent(widget);
+ // First get the root window.
+ GtkWidget* root = widget;
+ while (root && !GTK_IS_WINDOW(root)) {
+ root = gtk_widget_get_parent(root);
}
+ DCHECK(root);
+ // Translate the coordinate from widget to root window.
+ gtk_widget_translate_coordinates(widget, root, 0, 0, x, y);
+ // Then adjust the position with the position of the root window.
+ int window_x, window_y;
+ gtk_window_get_position(GTK_WINDOW(root), &window_x, &window_y);
+ *x += window_x;
+ *y += window_y;
}
// Returns the view::Event::flags for a GdkEventButton.
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698