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

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

Issue 8952002: GTK: Remove more deprecated stuff. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Fix spaces Created 9 years 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/gtk_chrome_shrinkable_hbox.cc ('k') | chrome/browser/ui/gtk/rounded_window.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/gtk/gtk_util.cc
diff --git a/chrome/browser/ui/gtk/gtk_util.cc b/chrome/browser/ui/gtk/gtk_util.cc
index 2f7dc09fc37b973d5d688bf7b14305be58858b78..8511e7da9ff44a4aabe0beb4b5df518cde2818dc 100644
--- a/chrome/browser/ui/gtk/gtk_util.cc
+++ b/chrome/browser/ui/gtk/gtk_util.cc
@@ -416,17 +416,21 @@ void UndoForceFontSize(GtkWidget* widget) {
}
gfx::Point GetWidgetScreenPosition(GtkWidget* widget) {
- if (!widget->window) {
+ GdkWindow* window = gtk_widget_get_window(widget);
+
+ if (!window) {
NOTREACHED() << "Must only be called on realized widgets.";
return gfx::Point(0, 0);
}
gint x, y;
- gdk_window_get_origin(widget->window, &x, &y);
+ gdk_window_get_origin(window, &x, &y);
- if (GTK_WIDGET_NO_WINDOW(widget)) {
- x += widget->allocation.x;
- y += widget->allocation.y;
+ if (!gtk_widget_get_has_window(widget)) {
+ GtkAllocation allocation;
+ gtk_widget_get_allocation(widget, &allocation);
+ x += allocation.x;
+ y += allocation.y;
}
return gfx::Point(x, y);
@@ -434,8 +438,12 @@ gfx::Point GetWidgetScreenPosition(GtkWidget* widget) {
gfx::Rect GetWidgetScreenBounds(GtkWidget* widget) {
gfx::Point position = GetWidgetScreenPosition(widget);
+
+ GtkAllocation allocation;
+ gtk_widget_get_allocation(widget, &allocation);
+
return gfx::Rect(position.x(), position.y(),
- widget->allocation.width, widget->allocation.height);
+ allocation.width, allocation.height);
}
gfx::Size GetWidgetSize(GtkWidget* widget) {
@@ -507,18 +515,27 @@ void SetButtonTriggersNavigation(GtkWidget* button) {
int MirroredLeftPointForRect(GtkWidget* widget, const gfx::Rect& bounds) {
if (!base::i18n::IsRTL())
return bounds.x();
- return widget->allocation.width - bounds.x() - bounds.width();
+
+ GtkAllocation allocation;
+ gtk_widget_get_allocation(widget, &allocation);
+ return allocation.width - bounds.x() - bounds.width();
}
int MirroredRightPointForRect(GtkWidget* widget, const gfx::Rect& bounds) {
if (!base::i18n::IsRTL())
return bounds.right();
- return widget->allocation.width - bounds.x();
+
+ GtkAllocation allocation;
+ gtk_widget_get_allocation(widget, &allocation);
+ return allocation.width - bounds.x();
}
int MirroredXCoordinate(GtkWidget* widget, int x) {
- if (base::i18n::IsRTL())
- return widget->allocation.width - x;
+ if (base::i18n::IsRTL()) {
+ GtkAllocation allocation;
+ gtk_widget_get_allocation(widget, &allocation);
+ return allocation.width - x;
+ }
return x;
}
@@ -816,7 +833,10 @@ gfx::Rect GetWidgetRectRelativeToToplevel(GtkWidget* widget) {
toplevel,
0, 0,
&x, &y);
- return gfx::Rect(x, y, widget->allocation.width, widget->allocation.height);
+
+ GtkAllocation allocation;
+ gtk_widget_get_allocation(widget, &allocation);
+ return gfx::Rect(x, y, allocation.width, allocation.height);
}
void SuppressDefaultPainting(GtkWidget* container) {
@@ -866,11 +886,13 @@ gfx::Rect WidgetBounds(GtkWidget* widget) {
//
// Widget coordinates are a bit odd; for historical reasons, they are
// defined as widget->window coordinates for widgets that are not
- // GTK_NO_WINDOW widgets, and are relative to widget->allocation.x,
- // widget->allocation.y for widgets that are GTK_NO_WINDOW widgets.
+ // GTK_NO_WINDOW widgets, and are relative to allocation.x, allocation.y
+ // for widgets that are GTK_NO_WINDOW widgets.
//
// So the base is always (0,0).
- return gfx::Rect(0, 0, widget->allocation.width, widget->allocation.height);
+ GtkAllocation allocation;
+ gtk_widget_get_allocation(widget, &allocation);
+ return gfx::Rect(0, 0, allocation.width, allocation.height);
}
void SetWMLastUserActionTime(GtkWindow* window) {
« no previous file with comments | « chrome/browser/ui/gtk/gtk_chrome_shrinkable_hbox.cc ('k') | chrome/browser/ui/gtk/rounded_window.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698