frame: Put a MetaUIFrame* in our MetaFrame

This is a small start, but it lets us start to clean up this
UI split mess.
This commit is contained in:
Jasper St. Pierre
2014-12-31 21:55:36 -08:00
parent c8432cc430
commit 2413e672c8
6 changed files with 39 additions and 32 deletions

View File

@ -85,15 +85,17 @@ meta_window_ensure_frame (MetaWindow *window)
else
visual = NULL;
frame->xwindow = meta_ui_create_frame_window (window->screen->ui,
window->display->xdisplay,
visual,
frame->rect.x,
frame->rect.y,
frame->rect.width,
frame->rect.height,
frame->window->screen->number,
&create_serial);
frame->ui_frame = meta_ui_create_frame (window->screen->ui,
window->display->xdisplay,
visual,
frame->rect.x,
frame->rect.y,
frame->rect.width,
frame->rect.height,
frame->window->screen->number,
&create_serial);
frame->xwindow = frame->ui_frame->xwindow;
meta_stack_tracker_record_add (window->screen->stack_tracker,
frame->xwindow,
create_serial);

View File

@ -24,6 +24,8 @@
#include "window-private.h"
#include "ui/frames.h"
struct _MetaFrame
{
/* window we frame */
@ -50,6 +52,8 @@ struct _MetaFrame
guint need_reapply_frame_shape : 1;
guint is_flashing : 1; /* used by the visual bell flash */
guint borders_cached : 1;
MetaUIFrame *ui_frame;
};
void meta_window_ensure_frame (MetaWindow *window);