diff options
| author | Sam Spilsbury <sam.spilsbury@canonical.com> | 2011-02-17 11:29:06 +0800 |
|---|---|---|
| committer | Sam Spilsbury <sam.spilsbury@canonical.com> | 2011-02-17 11:29:06 +0800 |
| commit | 71b95f83661d1bee5a4f2588e1d7e41afed4de35 (patch) | |
| tree | 2247edca01d0b4f6f059f6bf4bf7bc4952c1273f /gtk/window-decorator | |
| parent | b20966fa16ed70b6e17c335bd7abe17469b04820 (diff) | |
| download | compiz-with-glib-mainloop-71b95f83661d1bee5a4f2588e1d7e41afed4de35.tar.gz compiz-with-glib-mainloop-71b95f83661d1bee5a4f2588e1d7e41afed4de35.tar.bz2 | |
Cleanup meta_update_border_extents function
Don't need to retrieve the frame all the time, just get it once
Diffstat (limited to 'gtk/window-decorator')
| -rw-r--r-- | gtk/window-decorator/metacity.c | 39 |
1 files changed, 16 insertions, 23 deletions
diff --git a/gtk/window-decorator/metacity.c b/gtk/window-decorator/metacity.c index d781716..02d9bda 100644 --- a/gtk/window-decorator/metacity.c +++ b/gtk/window-decorator/metacity.c @@ -1594,57 +1594,50 @@ meta_update_border_extents () { MetaTheme *theme; MetaFrameType frame_type; + decor_frame_t *frame; decor_frame_type d_frame_type; - WnckWindowType win_types[] = { WNCK_WINDOW_NORMAL, WNCK_WINDOW_DIALOG, - WNCK_WINDOW_MENU, WNCK_WINDOW_UTILITY, - WNCK_WINDOW_SPLASHSCREEN, WNCK_WINDOW_SPLASHSCREEN }; - gint top_height, bottom_height, left_width, right_width; unsigned int i; theme = meta_theme_get_current (); - for (i = 0; i < NUM_DECOR_FRAMES; i++) + for (i = 0; i < DECOR_FRAME_TYPE_SWITCHER; i++) { - d_frame_type = get_frame_type (win_types[i]); - - if (d_frame_type == DECOR_FRAME_TYPE_UNDECORATED) - continue; - - frame_type = meta_get_frame_type_for_decor_type (d_frame_type); + frame = gwd_get_decor_frame (i); + frame_type = meta_get_frame_type_for_decor_type (i); meta_theme_get_frame_borders (theme, frame_type, - gwd_get_decor_frame (d_frame_type)->text_height, + frame->text_height, 0, &top_height, &bottom_height, &left_width, &right_width); - gwd_get_decor_frame (d_frame_type)->win_extents.top = gwd_get_decor_frame (DECOR_FRAME_TYPE_DEFAULT)->win_extents.top; - gwd_get_decor_frame (d_frame_type)->win_extents.bottom = bottom_height; - gwd_get_decor_frame (d_frame_type)->win_extents.left = left_width; - gwd_get_decor_frame (d_frame_type)->win_extents.right = right_width; + frame->win_extents.top = gwd_get_decor_frame (DECOR_FRAME_TYPE_DEFAULT)->win_extents.top; + frame->win_extents.bottom = bottom_height; + frame->win_extents.left = left_width; + frame->win_extents.right = right_width; - gwd_get_decor_frame (d_frame_type)->titlebar_height = top_height - gwd_get_decor_frame (d_frame_type)->win_extents.top; + frame->titlebar_height = top_height - frame->win_extents.top; meta_theme_get_frame_borders (theme, frame_type, - gwd_get_decor_frame (d_frame_type)->text_height, + frame->text_height, META_FRAME_MAXIMIZED, &top_height, &bottom_height, &left_width, &right_width); - gwd_get_decor_frame (d_frame_type)->max_win_extents.top = gwd_get_decor_frame (DECOR_FRAME_TYPE_DEFAULT)->win_extents.top; - gwd_get_decor_frame (d_frame_type)->max_win_extents.bottom = bottom_height; - gwd_get_decor_frame (d_frame_type)->max_win_extents.left = left_width; - gwd_get_decor_frame (d_frame_type)->max_win_extents.right = right_width; + frame->max_win_extents.top = gwd_get_decor_frame (DECOR_FRAME_TYPE_DEFAULT)->win_extents.top; + frame->max_win_extents.bottom = bottom_height; + frame->max_win_extents.left = left_width; + frame->max_win_extents.right = right_width; - gwd_get_decor_frame (d_frame_type)->max_titlebar_height = top_height - gwd_get_decor_frame (d_frame_type)->max_win_extents.top; + frame->max_titlebar_height = top_height - frame->max_win_extents.top; } } |