Merge lp:~larsu/gtk/lp1339495 into lp:~ubuntu-desktop/gtk/ubuntugtk3

Proposed by Lars Karlitski on 2014-07-11
Status: Merged
Merged at revision: 357
Proposed branch: lp:~larsu/gtk/lp1339495
Merge into: lp:~ubuntu-desktop/gtk/ubuntugtk3
Diff against target: 96 lines (+76/-0)
3 files modified
debian/changelog (+7/-0)
debian/patches/git_reftests-Improve-workaround-for-GtkGrid-bug.patch (+68/-0)
debian/patches/series (+1/-0)
To merge this branch: bzr merge lp:~larsu/gtk/lp1339495
Reviewer Review Type Date Requested Status
Sebastien Bacher Approve on 2014-07-11
VCS imports 2014-07-11 Pending
Review via email: mp+226430@code.launchpad.net

This proposal supersedes a proposal from 2014-07-11.

Description of the change

Backport reftests-Improve-workaround-for-GtkGrid-bug from master

To post a comment you must log in.
Sebastien Bacher (seb128) wrote :

Thanks!

review: Approve

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 2014-06-18 15:40:12 +0000
3+++ debian/changelog 2014-07-11 10:08:58 +0000
4@@ -1,3 +1,10 @@
5+gtk+3.0 (3.12.2-0ubuntu5) UNRELEASED; urgency=medium
6+
7+ * debian/patches/git_reftests-Improve-workaround-for-GtkGrid-bug.patch:
8+ - backport from master (lp: #1339495)
9+
10+ -- Lars Uebernickel <lars.uebernickel@ubuntu.com> Fri, 11 Jul 2014 12:05:56 +0200
11+
12 gtk+3.0 (3.12.2-0ubuntu4) utopic; urgency=medium
13
14 * debian/patches/git-gtkpopover-set-background-and-popover-css.patch
15
16=== added file 'debian/patches/git_reftests-Improve-workaround-for-GtkGrid-bug.patch'
17--- debian/patches/git_reftests-Improve-workaround-for-GtkGrid-bug.patch 1970-01-01 00:00:00 +0000
18+++ debian/patches/git_reftests-Improve-workaround-for-GtkGrid-bug.patch 2014-07-11 10:08:58 +0000
19@@ -0,0 +1,68 @@
20+From 6a2ae1bb9058086acfc1e2a9da6f4163b876af1e Mon Sep 17 00:00:00 2001
21+From: Benjamin Otte <otte@redhat.com>
22+Date: Thu, 10 Jul 2014 14:16:06 +0200
23+Subject: [PATCH] reftests: Improve workaround for GtkGrid bug
24+
25+... so that it works with wide separators. Or rather: with separators
26+that don't request 1px size but any other number. Do that by making the
27+placeholder request the same size by indeed stuffing (hidden) separators
28+in it.
29+---
30+ testsuite/reftests/separator-size.ui | 36 ++++++++++++++++++++++++++++++------
31+ 1 file changed, 30 insertions(+), 6 deletions(-)
32+
33+diff --git a/testsuite/reftests/separator-size.ui b/testsuite/reftests/separator-size.ui
34+index 006c44e..ae109b6 100644
35+--- a/testsuite/reftests/separator-size.ui
36++++ b/testsuite/reftests/separator-size.ui
37+@@ -126,17 +126,41 @@
38+ <!-- BEGIN REMOVE WHEN GRID FIXED -->
39+
40+ <child>
41+- <object class="GtkBox" id="remove-me-when-grid-is-fixed">
42++ <object class="GtkNotebook" id="notebook1">
43+ <property name="visible">True</property>
44+- <property name="can_focus">False</property>
45+- <property name="width-request">1</property>
46+- <property name="height-request">1</property>
47++ <property name="can_focus">True</property>
48++ <property name="show_tabs">False</property>
49++ <property name="show_border">False</property>
50++ <child>
51++ <object class="GtkBox" id="box5">
52++ <property name="visible">True</property>
53++ <property name="can_focus">False</property>
54++ <property name="orientation">vertical</property>
55++ </object>
56++ </child>
57++ <child>
58++ <object class="GtkSeparator" id="separator5">
59++ <property name="visible">True</property>
60++ <property name="can_focus">False</property>
61++ </object>
62++ <packing>
63++ <property name="position">1</property>
64++ </packing>
65++ </child>
66++ <child>
67++ <object class="GtkSeparator" id="separator6">
68++ <property name="visible">True</property>
69++ <property name="can_focus">False</property>
70++ <property name="orientation">vertical</property>
71++ </object>
72++ <packing>
73++ <property name="position">2</property>
74++ </packing>
75++ </child>
76+ </object>
77+ <packing>
78+ <property name="left_attach">1</property>
79+ <property name="top_attach">1</property>
80+- <property name="width">1</property>
81+- <property name="height">1</property>
82+ </packing>
83+ </child>
84+
85+--
86+2.0.1
87+
88
89=== modified file 'debian/patches/series'
90--- debian/patches/series 2014-06-18 15:39:36 +0000
91+++ debian/patches/series 2014-07-11 10:08:58 +0000
92@@ -21,3 +21,4 @@
93 gtkaboutdialog-support-showing-buttons-in-action-are.patch
94 message-dialog-restore-traditional-look-on-unity.patch
95 git-gtkpopover-set-background-and-popover-css.patch
96+git_reftests-Improve-workaround-for-GtkGrid-bug.patch

Subscribers

People subscribed via source and target branches

to all changes: