isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-02-17 21:54:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

theme: Require a GTK+ style context in meta_theme_calc_geometry

Browse Source
This commit is contained in:
Jasper St. Pierre 2012-04-26 19:26:49 -04:00
parent bdb995d758
commit fef2a061a8
3 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/ui/frames.c
View File

@ -505,6 +505,7 @@ meta_frames_calc_geometry (MetaFrames *frames,
meta_prefs_get_button_layout (&button_layout); meta_prefs_get_button_layout (&button_layout);
meta_theme_calc_geometry (frame->tv->theme, meta_theme_calc_geometry (frame->tv->theme,
frame->tv->style_context,
type, type,
frame->text_height, frame->text_height,
flags, flags,

1
src/ui/theme-private.h
View File

@ -1086,6 +1086,7 @@ void meta_theme_get_frame_borders (MetaTheme *theme,
MetaFrameBorders *borders); MetaFrameBorders *borders);
void meta_theme_calc_geometry (MetaTheme *theme, void meta_theme_calc_geometry (MetaTheme *theme,
GtkStyleContext *ctx,
MetaFrameType type, MetaFrameType type,
int text_height, int text_height,
MetaFrameFlags flags, MetaFrameFlags flags,

4
src/ui/theme.c
View File

@ -514,6 +514,7 @@ strip_button (MetaButtonSpace *func_rects[MAX_BUTTONS_PER_CORNER],
static void static void
meta_frame_layout_calc_geometry (const MetaFrameLayout *layout, meta_frame_layout_calc_geometry (const MetaFrameLayout *layout,
GtkStyleContext *ctx,
int text_height, int text_height,
MetaFrameFlags flags, MetaFrameFlags flags,
int client_width, int client_width,
@ -5047,6 +5048,7 @@ meta_theme_draw_frame_with_style (MetaTheme *theme,
return; return;
meta_frame_layout_calc_geometry (style->layout, meta_frame_layout_calc_geometry (style->layout,
style_gtk,
text_height, text_height,
flags, flags,
client_width, client_height, client_width, client_height,
@ -5116,6 +5118,7 @@ meta_theme_get_frame_borders (MetaTheme *theme,
void void
meta_theme_calc_geometry (MetaTheme *theme, meta_theme_calc_geometry (MetaTheme *theme,
GtkStyleContext *ctx,
MetaFrameType type, MetaFrameType type,
int text_height, int text_height,
MetaFrameFlags flags, MetaFrameFlags flags,
@ -5135,6 +5138,7 @@ meta_theme_calc_geometry (MetaTheme *theme,
return; return;
meta_frame_layout_calc_geometry (style->layout, meta_frame_layout_calc_geometry (style->layout,
ctx,
text_height, text_height,
flags, flags,
client_width, client_height, client_width, client_height,