AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-27 22:20:24 +00:00
Code Issues Projects Releases Wiki Activity

gdk: Get rid of gdk_drawable_get_size() usage

Browse Source
This commit is contained in:
Benjamin Otte 2010-09-20 12:53:46 +02:00
parent 0a57863f73
commit 9826c31a9f
2 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gdk/gdkdevice.c
View File

@ -1255,7 +1255,8 @@ _gdk_device_translate_window_coord (GdkDevice *device,
} }
window_private = (GdkWindowObject *) window; window_private = (GdkWindowObject *) window;
gdk_drawable_get_size (window, &window_width, &window_height); window_width = gdk_window_get_width (window);
window_height = gdk_window_get_height (window);
x_resolution = axis_info_x->resolution; x_resolution = axis_info_x->resolution;
y_resolution = axis_info_y->resolution; y_resolution = axis_info_y->resolution;

24
gdk/gdkwindow.c
View File

@ -3075,15 +3075,10 @@ gdk_window_end_paint (GdkWindow *window)
composited->parent; composited->parent;
composited = composited->parent) composited = composited->parent)
{ {
int width, height;
gdk_drawable_get_size (GDK_DRAWABLE (composited->parent),
&width, &height);
clip_box.x += composited->x; clip_box.x += composited->x;
clip_box.y += composited->y; clip_box.y += composited->y;
clip_box.width = MIN (clip_box.width, width - clip_box.x); clip_box.width = MIN (clip_box.width, composited->parent->width - clip_box.x);
clip_box.height = MIN (clip_box.height, height - clip_box.y); clip_box.height = MIN (clip_box.height, composited->parent->height - clip_box.y);
if (composited->composited) if (composited->composited)
{ {
@ -4318,9 +4313,8 @@ gdk_window_invalidate_rect_full (GdkWindow *window,
{ {
window_rect.x = 0; window_rect.x = 0;
window_rect.y = 0; window_rect.y = 0;
gdk_drawable_get_size (GDK_DRAWABLE (window), window_rect.width = private->width;
&window_rect.width, window_rect.height = private->height;
&window_rect.height);
rect = &window_rect; rect = &window_rect;
} }
@ -6880,11 +6874,11 @@ gdk_window_set_device_cursor (GdkWindow *window,
* *
* <note> * <note>
* If @window is not a toplevel, it is <emphasis>much</emphasis> better * If @window is not a toplevel, it is <emphasis>much</emphasis> better
* to call gdk_window_get_position() and gdk_drawable_get_size() instead, * to call gdk_window_get_position(), gdk_window_get_width() and
* because it avoids the roundtrip to the X server and because * gdk_window_get_height() instead, because it avoids the roundtrip to
* gdk_drawable_get_size() supports the full 32-bit coordinate space, * the X server and because these functions support the full 32-bit
* whereas gdk_window_get_geometry() is restricted to the 16-bit * coordinate space, whereas gdk_window_get_geometry() is restricted to
* coordinates of X11. * the 16-bit coordinates of X11.
*</note> *</note>
**/ **/
void void