brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

theme: Use style information from GTK+

Browse Source 
We now have everything in place to pick up geometry and drawing
information from GTK+ rather than the metacity theme, so do just
that; the metacity theme is now only used for some constants
(title_scale, hide_buttons, ...), which we will replace soon.

https://bugzilla.gnome.org/show_bug.cgi?id=741917
This commit is contained in:
Florian Müllner
2014-09-23 04:20:22 +02:00
committed by Jasper St. Pierre
parent fb1459062f
commit 6eda784cf0
4 changed files with 140 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/ui/frames.c
View File

@@ -479,6 +479,7 @@ meta_frames_calc_geometry (MetaFrames *frames,
meta_prefs_get_button_layout (&button_layout);
meta_theme_calc_geometry (meta_theme_get_current (),
frame->style_info,
type,
frame->text_height,
flags,
@@ -646,6 +647,7 @@ meta_ui_frame_get_borders (MetaFrames *frames,
* window size
*/
meta_theme_get_frame_borders (meta_theme_get_current (),
frame->style_info,
type,
frame->text_height,
flags,
@@ -1587,7 +1589,7 @@ get_visible_frame_border_region (MetaUIFrame *frame)
META_CORE_GET_FRAME_RECT, &frame_rect,
META_CORE_GET_END);
meta_theme_get_frame_borders (meta_theme_get_current (),
meta_theme_get_frame_borders (meta_theme_get_current (), frame->style_info,
type, frame->text_height, flags,
&borders);
@@ -1755,7 +1757,6 @@ meta_frames_paint (MetaFrames *frames,
MetaFrameFlags flags;
MetaFrameType type;
GdkPixbuf *mini_icon;
GdkPixbuf *icon;
int w, h;
MetaButtonState button_states[META_BUTTON_TYPE_LAST];
int i;
@@ -1818,7 +1819,6 @@ meta_frames_paint (MetaFrames *frames,
META_CORE_GET_FRAME_FLAGS, &flags,
META_CORE_GET_FRAME_TYPE, &type,
META_CORE_GET_MINI_ICON, &mini_icon,
META_CORE_GET_ICON, &icon,
META_CORE_GET_CLIENT_WIDTH, &w,
META_CORE_GET_CLIENT_HEIGHT, &h,
META_CORE_GET_END);
@@ -1837,7 +1837,7 @@ meta_frames_paint (MetaFrames *frames,
frame->text_height,
&button_layout,
button_states,
mini_icon, icon);
mini_icon);
}
static gboolean