sungmg/mutter-performance-source
1
0
Fork 0
Code Activity

window/x11: Rename meta_window_x11_buffer_rect_to_frame_rect

Browse source 
To keep consistent and avoid confusion, rename the function:
    `meta_window_x11_buffer_rect_to_frame_rect()`
to:
    `meta_window_x11_surface_rect_to_frame_rect()`

As this function doesn't deal with the `window->buffer_rect` at all.

https://gitlab.gnome.org/GNOME/mutter/merge_requests/1091
This commit is contained in:
Olivier Fourdan 2020-03-10 14:44:15 +01:00
parent 267f712068
commit 0743381573
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/compositor/meta-window-actor-x11.c
View file

@ -929,7 +929,7 @@ build_and_scan_frame_mask (MetaWindowActorX11 *actor_x11,
*/ */
if (meta_window_x11_always_update_shape (window)) if (meta_window_x11_always_update_shape (window))
{ {
meta_window_x11_buffer_rect_to_frame_rect (window, &rect, &frame_rect); meta_window_x11_surface_rect_to_frame_rect (window, &rect, &frame_rect);
get_client_area_rect_from_texture (actor_x11, stex, &client_area); get_client_area_rect_from_texture (actor_x11, stex, &client_area);
} }
else else

8
src/x11/window-x11.c
View file

@ -4075,9 +4075,9 @@ meta_window_x11_always_update_shape (MetaWindow *window)
} }
void void
meta_window_x11_buffer_rect_to_frame_rect (MetaWindow *window, meta_window_x11_surface_rect_to_frame_rect (MetaWindow *window,
MetaRectangle *buffer_rect, MetaRectangle *surface_rect,
MetaRectangle *frame_rect) MetaRectangle *frame_rect)
{ {
MetaFrameBorders borders; MetaFrameBorders borders;
@ -4086,7 +4086,7 @@ meta_window_x11_buffer_rect_to_frame_rect (MetaWindow *window,
meta_frame_calc_borders (window->frame, &borders); meta_frame_calc_borders (window->frame, &borders);
*frame_rect = *buffer_rect; *frame_rect = *surface_rect;
frame_rect->x += borders.invisible.left; frame_rect->x += borders.invisible.left;
frame_rect->y += borders.invisible.top; frame_rect->y += borders.invisible.top;
frame_rect->width -= borders.invisible.left + borders.invisible.right; frame_rect->width -= borders.invisible.left + borders.invisible.right;

4
src/x11/window-x11.h
View file

@ -89,8 +89,8 @@ void meta_window_x11_set_thaw_after_paint (MetaWindow *window,
gboolean meta_window_x11_should_thaw_after_paint (MetaWindow *window); gboolean meta_window_x11_should_thaw_after_paint (MetaWindow *window);
gboolean meta_window_x11_always_update_shape (MetaWindow *window); gboolean meta_window_x11_always_update_shape (MetaWindow *window);
void meta_window_x11_buffer_rect_to_frame_rect (MetaWindow *window, void meta_window_x11_surface_rect_to_frame_rect (MetaWindow *window,
MetaRectangle *buffer_rect, MetaRectangle *surface_rect,
MetaRectangle *frame_rect); MetaRectangle *frame_rect);
void meta_window_x11_surface_rect_to_client_rect (MetaWindow *window, void meta_window_x11_surface_rect_to_client_rect (MetaWindow *window,
MetaRectangle *surface_rect, MetaRectangle *surface_rect,