Compiz

Merge lp:~mkhu/compiz/compiz.fix_1077823 into lp:compiz/0.9.9

  1. compiz.fix_1077823
  2. Merge into 0.9.9
Proposed by Micheal Hsu
Status: Merged
Approved by: Daniel van Vugt
Approved revision: 3464
Merged at revision: 3464
Proposed branch: lp:~mkhu/compiz/compiz.fix_1077823
Merge into: lp:compiz/0.9.9
Diff against target: 17 lines (+3/-3)
1 file modified
gtk/window-decorator/decorator.c (+3/-3)
To merge this branch: bzr merge lp:~mkhu/compiz/compiz.fix_1077823
Reviewer Review Type Date Requested Status
Daniel van Vugt Approve
Sam Spilsbury Approve
PS Jenkins bot continuous-integration Pending
Review via email: mp+133862@code.launchpad.net

Commit message

decorator.c: update_window_decoration_icon(...). 32 bit pixmap on pixmap mode,
24 for reparenting.
(LP: #1007944) (LP: #1077823)

Description of the change

in gtk-window-decorator: decorator.c : update_window_decoration_icon (WnckWindow *win)

we should use 'style_window_rgb' instead of 'style_window_rgba'when in reparenting mode:
////////////////////////////
/* 32 bit pixmap on pixmap mode, 24 for reparenting */
 if (d->frame_window)
     d->icon_pixmap = pixmap_new_from_pixbuf (d->icon_pixbuf,
           d->frame->style_window_rgba);
 else
     d->icon_pixmap = pixmap_new_from_pixbuf (d->icon_pixbuf,
           d->frame->style_window_rgb);
//////////////////////////////

there isn't any bugs related to this. but i think it should be corrected.

To post a comment you must log in.
Revision history for this message
Sam Spilsbury (smspillaz) wrote :

There is actually a bug that this fixes. Try changing to a theme that features the window icon in the titlebar in 2D mode.

review: Approve
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

Sounds like bug 1007944.

Revision history for this message
Daniel van Vugt (vanvugt) wrote :

Looks OK.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'gtk/window-decorator/decorator.c'
2--- gtk/window-decorator/decorator.c 2012-11-08 09:11:30 +0000
3+++ gtk/window-decorator/decorator.c 2012-11-12 07:22:21 +0000
4@@ -558,10 +558,10 @@
5 /* 32 bit pixmap on pixmap mode, 24 for reparenting */
6 if (d->frame_window)
7 d->icon_pixmap = pixmap_new_from_pixbuf (d->icon_pixbuf,
8+ d->frame->style_window_rgb);
9+ else
10+ d->icon_pixmap = pixmap_new_from_pixbuf (d->icon_pixbuf,
11 d->frame->style_window_rgba);
12- else
13- d->icon_pixmap = pixmap_new_from_pixbuf (d->icon_pixbuf,
14- d->frame->style_window_rgb);
15 cr = gdk_cairo_create (GDK_DRAWABLE (d->icon_pixmap));
16 d->icon = cairo_pattern_create_for_surface (cairo_get_target (cr));
17 cairo_destroy (cr);

Subscribers

People subscribed via source and target branches