Merge lp:~gunnarhj/gnome-control-center/more-scrolling into lp:~ubuntu-desktop/gnome-control-center/ubuntu

Proposed by Gunnar Hjalmarsson on 2018-03-27
Status: Merged
Merged at revision: 816
Proposed branch: lp:~gunnarhj/gnome-control-center/more-scrolling
Merge into: lp:~ubuntu-desktop/gnome-control-center/ubuntu
Diff against target: 145 lines (+101/-7)
2 files modified
debian/patches/0005-region-Show-scrollbars-if-needed.patch (+100/-6)
debian/patches/series (+1/-1)
To merge this branch: bzr merge lp:~gunnarhj/gnome-control-center/more-scrolling
Reviewer Review Type Date Requested Status
Iain Lane 2018-03-27 Approve on 2018-03-29
Review via email: mp+342228@code.launchpad.net
To post a comment you must log in.
813. By Ken VanDine on 2018-03-28

releasing package gnome-control-center version 1:3.28.0-0ubuntu4

814. By Didier Roche on 2018-03-28

* debian/patches/71_ubuntu_dock_settings.patch:
  - add context for dock settings where left/right is translated differently
    to mouse buttons (LP: #1719462).

815. By Didier Roche on 2018-03-28

releasing package gnome-control-center version 1:3.28.0-0ubuntu5

816. By Gunnar Hjalmarsson on 2018-03-29

* debian/patches/0005-region-Show-scrollbars-if-needed.patch:
  - Scrollbars for "Formats" and "Input Sources" too (LP: #1758979)

Iain Lane (laney) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== renamed file 'debian/patches/0005-Show-scrollbar-on-first-Language-window-if-needed.patch' => 'debian/patches/0005-region-Show-scrollbars-if-needed.patch'
2--- debian/patches/0005-Show-scrollbar-on-first-Language-window-if-needed.patch 2018-03-19 13:42:07 +0000
3+++ debian/patches/0005-region-Show-scrollbars-if-needed.patch 2018-03-29 04:31:30 +0000
4@@ -1,19 +1,24 @@
5 From: Gunnar Hjalmarsson <gunnarhj@ubuntu.com>
6 Date: Mon, 26 Feb 2018 21:20:30 +0100
7-Subject: Show scrollbar on first Language window if needed
8+Subject: [PATCH] region: Show scrollbars if needed
9
10 If we are initially showing more languages than can be fit, we should
11 scroll then too.
12
13+Bug: https://launchpad.net/bugs/1727710, https://launchpad.net/bugs/1758979
14 Bug-Upstream: https://bugzilla.gnome.org/show_bug.cgi?id=793861
15 Forwarded: https://gitlab.gnome.org/GNOME/gnome-control-center/merge_requests/12
16 ---
17- panels/common/cc-language-chooser.c | 8 --------
18- panels/common/language-chooser.ui | 3 ++-
19- 2 files changed, 2 insertions(+), 9 deletions(-)
20+ panels/common/cc-language-chooser.c | 8 --------
21+ panels/common/language-chooser.ui | 3 ++-
22+ panels/region/cc-format-chooser.c | 11 -----------
23+ panels/region/cc-input-chooser.c | 1 -
24+ panels/region/format-chooser.ui | 3 ++-
25+ panels/region/input-chooser.ui | 3 ++-
26+ 6 files changed, 6 insertions(+), 23 deletions(-)
27
28 diff --git a/panels/common/cc-language-chooser.c b/panels/common/cc-language-chooser.c
29-index 961df5a..678c557 100644
30+index 961df5a0a..678c557bb 100644
31 --- a/panels/common/cc-language-chooser.c
32 +++ b/panels/common/cc-language-chooser.c
33 @@ -42,7 +42,6 @@ typedef struct {
34@@ -52,7 +57,7 @@
35 /* We ref-sink here so we can reuse this widget multiple times */
36 priv->no_results = g_object_ref_sink (no_results_widget_new ());
37 diff --git a/panels/common/language-chooser.ui b/panels/common/language-chooser.ui
38-index c8228bb..8077e14 100644
39+index c8228bbd9..8077e1487 100644
40 --- a/panels/common/language-chooser.ui
41 +++ b/panels/common/language-chooser.ui
42 @@ -36,7 +36,8 @@
43@@ -65,3 +70,92 @@
44 <property name="shadow-type">in</property>
45 <property name="margin-start">6</property>
46 <property name="margin-end">6</property>
47+diff --git a/panels/region/cc-format-chooser.c b/panels/region/cc-format-chooser.c
48+index 4998de99d..8c451cb9c 100644
49+--- a/panels/region/cc-format-chooser.c
50++++ b/panels/region/cc-format-chooser.c
51+@@ -41,7 +41,6 @@ typedef struct {
52+ GtkListBoxRow *more_item;
53+ GtkWidget *filter_entry;
54+ GtkWidget *list;
55+- GtkWidget *scrolledwindow;
56+ GtkWidget *date;
57+ GtkWidget *time;
58+ GtkWidget *date_time;
59+@@ -421,18 +420,12 @@ static void
60+ show_more (GtkDialog *chooser)
61+ {
62+ CcFormatChooserPrivate *priv = GET_PRIVATE (chooser);
63+- GtkWidget *widget;
64+ gint width, height;
65+
66+ gtk_window_get_size (GTK_WINDOW (chooser), &width, &height);
67+ gtk_widget_set_size_request (GTK_WIDGET (chooser), width, height);
68+ gtk_window_set_resizable (GTK_WINDOW (chooser), TRUE);
69+
70+- widget = priv->scrolledwindow;
71+- gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (widget),
72+- GTK_POLICY_NEVER,
73+- GTK_POLICY_AUTOMATIC);
74+-
75+ gtk_widget_show (priv->filter_entry);
76+ gtk_widget_grab_focus (priv->filter_entry);
77+
78+@@ -526,7 +519,6 @@ cc_format_chooser_new (GtkWidget *parent)
79+ priv->done_button = WID ("ok-button");
80+ priv->filter_entry = WID ("region-filter-entry");
81+ priv->list = WID ("region-list");
82+- priv->scrolledwindow = WID ("region-scrolledwindow");
83+ priv->more_item = more_widget_new ();
84+ /* We ref-sink here so we can reuse this widget multiple times */
85+ priv->no_results = g_object_ref_sink (no_results_widget_new ());
86+@@ -539,9 +531,6 @@ cc_format_chooser_new (GtkWidget *parent)
87+ priv->measurement = WID ("measurement-format");
88+ priv->paper = WID ("paper-format");
89+
90+- gtk_list_box_set_adjustment (GTK_LIST_BOX (priv->list),
91+- gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (priv->scrolledwindow)));
92+-
93+ gtk_list_box_set_sort_func (GTK_LIST_BOX (priv->list),
94+ (GtkListBoxSortFunc)sort_regions, chooser, NULL);
95+ gtk_list_box_set_filter_func (GTK_LIST_BOX (priv->list),
96+diff --git a/panels/region/cc-input-chooser.c b/panels/region/cc-input-chooser.c
97+index a5156ccbf..393bd2587 100644
98+--- a/panels/region/cc-input-chooser.c
99++++ b/panels/region/cc-input-chooser.c
100+@@ -1093,7 +1093,6 @@ cc_input_chooser_new (GtkWindow *main_window,
101+ priv->no_results = g_object_ref_sink (no_results_widget_new ());
102+ gtk_widget_show_all (priv->no_results);
103+
104+- gtk_list_box_set_adjustment (GTK_LIST_BOX (priv->list), priv->adjustment);
105+ gtk_list_box_set_filter_func (GTK_LIST_BOX (priv->list), list_filter, chooser, NULL);
106+ gtk_list_box_set_sort_func (GTK_LIST_BOX (priv->list), (GtkListBoxSortFunc)list_sort, chooser, NULL);
107+ g_signal_connect (priv->list, "row-activated", G_CALLBACK (row_activated), chooser);
108+diff --git a/panels/region/format-chooser.ui b/panels/region/format-chooser.ui
109+index 363dc8400..fc574a87e 100644
110+--- a/panels/region/format-chooser.ui
111++++ b/panels/region/format-chooser.ui
112+@@ -57,7 +57,8 @@
113+ <property name="can_focus">True</property>
114+ <property name="vexpand">True</property>
115+ <property name="hscrollbar_policy">never</property>
116+- <property name="vscrollbar_policy">never</property>
117++ <property name="vscrollbar_policy">automatic</property>
118++ <property name="propagate-natural-height">True</property>
119+ <property name="shadow_type">in</property>
120+ <child>
121+ <object class="GtkViewport" id="viewport1">
122+diff --git a/panels/region/input-chooser.ui b/panels/region/input-chooser.ui
123+index 41f602edd..10fcbe538 100644
124+--- a/panels/region/input-chooser.ui
125++++ b/panels/region/input-chooser.ui
126+@@ -37,7 +37,8 @@
127+ <object class="GtkScrolledWindow" id="scrolledwindow">
128+ <property name="visible">True</property>
129+ <property name="hscrollbar-policy">never</property>
130+- <property name="vscrollbar-policy">never</property>
131++ <property name="vscrollbar-policy">automatic</property>
132++ <property name="propagate-natural-height">True</property>
133+ <property name="shadow-type">in</property>
134+ <property name="margin-start">6</property>
135+ <property name="margin-end">6</property>
136
137=== modified file 'debian/patches/series'
138--- debian/patches/series 2018-03-22 18:41:48 +0000
139+++ debian/patches/series 2018-03-29 04:31:30 +0000
140@@ -1,4 +1,4 @@
141-0005-Show-scrollbar-on-first-Language-window-if-needed.patch
142+0005-region-Show-scrollbars-if-needed.patch
143
144 01_menu_category.patch
145 06_handle_passwd_with_ldap.patch

Subscribers

People subscribed via source and target branches