isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-06-13 16:59:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

frame: Start converting over to direct usage of MetaUIFrame

Browse Source
This commit is contained in:
Jasper St. Pierre
2014-12-31 22:09:23 -08:00
parent 2413e672c8
commit 8fdbae192a
5 changed files with 57 additions and 256 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/core/frame.c
View File

@ -213,7 +213,7 @@ meta_window_destroy_frame (MetaWindow *window)
window->frame->rect.y + borders.invisible.top);
meta_error_trap_pop (window->display);
meta_ui_destroy_frame_window (window->screen->ui, frame->xwindow);
meta_ui_frame_unmanage (frame->ui_frame);
meta_display_unregister_x_window (window->display,
frame->xwindow);
@ -333,9 +333,7 @@ meta_frame_calc_borders (MetaFrame *frame,
{
if (!frame->borders_cached)
{
meta_ui_get_frame_borders (frame->window->screen->ui,
frame->xwindow,
&frame->cached_borders);
meta_ui_frame_get_borders (frame->ui_frame, &frame->cached_borders);
frame->borders_cached = TRUE;
}
@ -360,8 +358,7 @@ meta_frame_sync_to_window (MetaFrame *frame,
frame->rect.x + frame->rect.width,
frame->rect.y + frame->rect.height);
meta_ui_move_resize_frame (frame->window->screen->ui,
frame->xwindow,
meta_ui_frame_move_resize (frame->ui_frame,
frame->rect.x,
frame->rect.y,
frame->rect.width,
@ -372,10 +369,8 @@ meta_frame_sync_to_window (MetaFrame *frame,
/* If we're interactively resizing the frame, repaint
* it immediately so we don't start to lag.
*/
if (frame->window->display->grab_window ==
frame->window)
meta_ui_repaint_frame (frame->window->screen->ui,
frame->xwindow);
if (frame->window->display->grab_window == frame->window)
meta_ui_frame_repaint (frame->ui_frame);
}
return need_resize;
@ -384,25 +379,20 @@ meta_frame_sync_to_window (MetaFrame *frame,
cairo_region_t *
meta_frame_get_frame_bounds (MetaFrame *frame)
{
return meta_ui_get_frame_bounds (frame->window->screen->ui,
frame->xwindow,
frame->rect.width,
frame->rect.height);
return meta_ui_frame_get_bounds (frame->ui_frame, frame->rect.width, frame->rect.height);
}
void
meta_frame_get_mask (MetaFrame *frame,
cairo_t *cr)
{
meta_ui_get_frame_mask (frame->window->screen->ui, frame->xwindow,
frame->rect.width, frame->rect.height, cr);
meta_ui_frame_get_mask (frame->ui_frame, frame->rect.width, frame->rect.height, cr);
}
void
meta_frame_queue_draw (MetaFrame *frame)
{
meta_ui_queue_frame_draw (frame->window->screen->ui,
frame->xwindow);
meta_ui_frame_queue_draw (frame->ui_frame);
}
void
@ -433,12 +423,12 @@ meta_frame_get_xwindow (MetaFrame *frame)
void
meta_frame_update_style (MetaFrame *frame)
{
meta_ui_update_frame_style (frame->window->screen->ui, frame->xwindow);
meta_ui_frame_update_style (frame->ui_frame);
}
void
meta_frame_update_title (MetaFrame *frame)
{
if (frame->window->title)
meta_ui_set_frame_title (frame->window->screen->ui, frame->xwindow, frame->window->title);
meta_ui_frame_set_title (frame->ui_frame, frame->window->title);
}