Merge lp:~larsu/gtk/remove-black-flicker into lp:~ubuntu-desktop/gtk/ubuntugtk3

Proposed by Lars Karlitski on 2015-11-16
Status: Merged
Merged at revision: 486
Proposed branch: lp:~larsu/gtk/remove-black-flicker
Merge into: lp:~ubuntu-desktop/gtk/ubuntugtk3
Diff against target: 61 lines (+41/-0)
3 files modified
debian/changelog (+7/-0)
debian/patches/0001-gtkwindow-continue-calling-gtk_style_context_set_bac.patch (+33/-0)
debian/patches/series (+1/-0)
To merge this branch: bzr merge lp:~larsu/gtk/remove-black-flicker
Reviewer Review Type Date Requested Status
Ubuntu Desktop 2015-11-16 Pending
Review via email: mp+277595@code.launchpad.net

Commit message

* Add debian/patches/0001-gtkwindow-continue-calling-gtk_style_context_set_bac.patch:
  - fixes black flickering when new windows are created

Description of the change

* Add debian/patches/0001-gtkwindow-continue-calling-gtk_style_context_set_bac.patch:
  - fixes black flickering when new windows are created

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2015-11-13 13:40:07 +0000
3+++ debian/changelog 2015-11-16 16:36:54 +0000
4@@ -1,3 +1,10 @@
5+gtk+3.0 (3.18.4-1ubuntu2) UNRELEASED; urgency=medium
6+
7+ * Add debian/patches/0001-gtkwindow-continue-calling-gtk_style_context_set_bac.patch:
8+ - fixes black flickering when new windows are created
9+
10+ -- Lars Uebernickel <lars.uebernickel@ubuntu.com> Mon, 16 Nov 2015 17:34:30 +0100
11+
12 gtk+3.0 (3.18.4-1ubuntu1) xenial; urgency=medium
13
14 * Merge with Debian. Remaining changes:
15
16=== added file 'debian/patches/0001-gtkwindow-continue-calling-gtk_style_context_set_bac.patch'
17--- debian/patches/0001-gtkwindow-continue-calling-gtk_style_context_set_bac.patch 1970-01-01 00:00:00 +0000
18+++ debian/patches/0001-gtkwindow-continue-calling-gtk_style_context_set_bac.patch 2015-11-16 16:36:54 +0000
19@@ -0,0 +1,33 @@
20+From e7528ab9b8ddbad892d9d5ce323549086897b72a Mon Sep 17 00:00:00 2001
21+From: Lars Uebernickel <lars.uebernickel@canonical.com>
22+Date: Mon, 16 Nov 2015 17:29:50 +0100
23+Subject: [PATCH] gtkwindow: continue calling
24+ gtk_style_context_set_background()
25+
26+Not doing so introduces black flicker when creating a new window on
27+compiz, because it lacks support for the frame sync protocol.
28+
29+https://bugzilla.gnome.org/show_bug.cgi?id=748498
30+---
31+ gtk/gtkwindow.c | 5 +++++
32+ 1 file changed, 5 insertions(+)
33+
34+diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
35+index 2d9f4b5..0476b6b 100644
36+--- a/gtk/gtkwindow.c
37++++ b/gtk/gtkwindow.c
38+@@ -7122,6 +7122,11 @@ gtk_window_realize (GtkWidget *widget)
39+ gtk_widget_register_window (widget, gdk_window);
40+ gtk_widget_set_realized (widget, TRUE);
41+
42++ G_GNUC_BEGIN_IGNORE_DEPRECATIONS
43++ if (!gtk_widget_get_app_paintable (widget))
44++ gtk_style_context_set_background (gtk_widget_get_style_context (widget), gdk_window);
45++ G_GNUC_END_IGNORE_DEPRECATIONS
46++
47+ attributes.x = allocation.x;
48+ attributes.y = allocation.y;
49+ attributes.width = allocation.width;
50+--
51+2.6.2
52+
53
54=== modified file 'debian/patches/series'
55--- debian/patches/series 2015-11-12 18:03:04 +0000
56+++ debian/patches/series 2015-11-16 16:36:54 +0000
57@@ -23,3 +23,4 @@
58 git_icon_fallback.patch
59 unity_rbga_tooltips.patch
60 git-refresh-mir-backend.patch
61+0001-gtkwindow-continue-calling-gtk_style_context_set_bac.patch

Subscribers

People subscribed via source and target branches

to all changes: