gnome-control-center

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

  1. more-scrolling
  2. Merge into ubuntu
Proposed by Gunnar Hjalmarsson
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 Approve
Review via email: mp+342228@code.launchpad.net
To post a comment you must log in.
lp:~gunnarhj/gnome-control-center/more-scrolling updated
813. By Ken VanDine

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

814. By Didier Roche-Tolomelli

* 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-Tolomelli

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

816. By Gunnar Hjalmarsson

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

Revision history for this message
Iain Lane (laney) :
review: Approve

Preview Diff

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

Subscribers

People subscribed via source and target branches