XFCE disables the system decorations if there's an xshape set. So

XFCE disables the system decorations if there's an xshape set.  So
only use the KWin hack when the custom frame is enabled.

This is still a bit buggy in KWin (toggling from custom frame -> system
decorations doesn't always re-attach system decorations), but it seems
like the best I can do.

[Elliot Glaysher, 2009-07-08 22:58:08]

LGTM

On Wed, Jul 8, 2009 at 3:53 PM, <tony@chromium.org> wrote:
> Reviewers: Evan Stade, Elliot Glaysher,
>
> Description:
> XFCE disables the system decorations if there's an xshape set. =A0So
> only use the KWin hack when the custom frame is enabled.
>
> This is still a bit buggy in KWin (toggling from custom frame -> system
> decorations doesn't always re-attach system decorations), but it seems
> like the best I can do.
>
> Please review this at http://codereview.chromium.org/155248
>
> Affected files:
> =A0M chrome/browser/gtk/browser_window_gtk.cc
>
>
> Index: chrome/browser/gtk/browser_window_gtk.cc
> diff --git a/chrome/browser/gtk/browser_window_gtk.cc
> b/chrome/browser/gtk/browser_window_gtk.cc
> index
> 3d5743318950ae5ff02b952e07d5fae1a2590707..1da4fd565334e6f20a87aed53818310=
366551686
> 100644
> --- a/chrome/browser/gtk/browser_window_gtk.cc
> +++ b/chrome/browser/gtk/browser_window_gtk.cc
> @@ -1118,12 +1118,16 @@ void BrowserWindowGtk::UpdateWindowShape(int widt=
h,
> int height) {
> =A0 =A0 gtk_alignment_set_padding(GTK_ALIGNMENT(window_container_), 1,
> =A0 =A0 =A0 =A0 kFrameBorderThickness, kFrameBorderThickness,
> kFrameBorderThickness);
> =A0 } else {
> - =A0 =A0// Disable rounded corners. =A0Simply passing in a NULL region d=
oesn't
> - =A0 =A0// seem to work on KWin, so manually set the shape to the whole =
window.
> - =A0 =A0GdkRectangle rect =3D { 0, 0, width, height };
> - =A0 =A0GdkRegion* mask =3D gdk_region_rectangle(&rect);
> - =A0 =A0gdk_window_shape_combine_region(GTK_WIDGET(window_)->window, mas=
k, 0,
> 0);
> - =A0 =A0gdk_region_destroy(mask);
> + =A0 =A0if (use_custom_frame_.GetValue()) {
> + =A0 =A0 =A0// Disable rounded corners. =A0Simply passing in a NULL regi=
on doesn't
> + =A0 =A0 =A0// seem to work on KWin, so manually set the shape to the wh=
ole
> window.
> + =A0 =A0 =A0GdkRectangle rect =3D { 0, 0, width, height };
> + =A0 =A0 =A0GdkRegion* mask =3D gdk_region_rectangle(&rect);
> + =A0 =A0 =A0gdk_window_shape_combine_region(GTK_WIDGET(window_)->window,=
 mask, 0,
> 0);
> + =A0 =A0 =A0gdk_region_destroy(mask);
> + =A0 =A0} else {
> + =A0 =A0 =A0gdk_window_shape_combine_region(GTK_WIDGET(window_)->window,=
 NULL, 0,
> 0);
> + =A0 =A0}
> =A0 =A0 gtk_alignment_set_padding(GTK_ALIGNMENT(window_container_), 0, 0,=
 0, 0);
> =A0 }
> =A0}
>
>
>

[Evan Stade, 2009-07-08 23:02:39]

lgtm

http://codereview.chromium.org/155248/diff/1/2
File chrome/browser/gtk/browser_window_gtk.cc (right):

http://codereview.chromium.org/155248/diff/1/2#newcode1121
Line 1121: if (use_custom_frame_.GetValue()) {
can you put the first line of the desc. as a comment here?