Merge lp://qastaging/~muktupavels/compiz/gwd-titlebar-font into lp://qastaging/compiz/0.9.12

Proposed by Alberts Muktupāvels
Status: Merged
Approved by: Marco Trevisan (Treviño)
Approved revision: 4066
Merged at revision: 4056
Proposed branch: lp://qastaging/~muktupavels/compiz/gwd-titlebar-font
Merge into: lp://qastaging/compiz/0.9.12
Prerequisite: lp://qastaging/~muktupavels/compiz/gwd-cleanup
Diff against target: 807 lines (+202/-253)
10 files modified
gtk/window-decorator/decorator.c (+9/-60)
gtk/window-decorator/frames.c (+0/-42)
gtk/window-decorator/gtk-window-decorator.c (+5/-9)
gtk/window-decorator/gtk-window-decorator.h (+3/-11)
gtk/window-decorator/gwd-settings.c (+7/-7)
gtk/window-decorator/gwd-theme-metacity.c (+34/-17)
gtk/window-decorator/gwd-theme.c (+76/-33)
gtk/window-decorator/gwd-theme.h (+50/-46)
gtk/window-decorator/tests/test_gwd_settings.cpp (+9/-9)
gtk/window-decorator/wnck.c (+9/-19)
To merge this branch: bzr merge lp://qastaging/~muktupavels/compiz/gwd-titlebar-font
Reviewer Review Type Date Requested Status
Sam Spilsbury Approve
Review via email: mp+296773@code.qastaging.launchpad.net

Commit message

gtk-window-decorator: improve titlebar font handling.

In Metacity 3.20 titlebar font is handled internally. To use custom / non-system titlebar font meta_theme_set_titlebar_font must be called with custom font. gwd_theme_metacity_update_titlebar_font is place were it will be done.

Previous Metacity versions has function to create titlebar font. Lets use it to make sure that decorations are equal between gtk-window-decorator and Metacity.

Old code on titlebar font change did unneeded work if not-system font was used. In update-frames signal old font was destroyed and then recreated. After that in update-decorations signal it was done again.

Description of the change

In Metacity 3.20 titlebar font is handled internally. To use custom / non-system titlebar font meta_theme_set_titlebar_font must be called with custom font. gwd_theme_metacity_update_titlebar_font is place were it will be done.

Previous Metacity versions has function to create titlebar font. Lets use it to make sure that decorations are equal between gtk-window-decorator and Metacity.

Old code on titlebar font change did unneeded work if not-system font was used. In update-frames signal old font was destroyed and then recreated. After that in update-decorations signal it was done again.

To post a comment you must log in.
4064. By Alberts Muktupāvels

Merge with lp:~albertsmuktupavels/compiz/gwd-cleanup.

Revision history for this message
Sam Spilsbury (smspillaz) wrote :

This looks great to me!

review: Approve
4065. By Alberts Muktupāvels

Merge with lp:~albertsmuktupavels/compiz/gwd-cleanup.

4066. By Alberts Muktupāvels

Merge with lp:~albertsmuktupavels/compiz/gwd-cleanup.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches