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

[Gunnar Hjalmarsson]

[lp:~gunnarhj/gnome-control-center/more-scrolling]

813. By Ken VanDine on 2018-03-28

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

814. By Didier Roche-Tolomelli 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-Tolomelli 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

=== 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 @@
 From: Gunnar Hjalmarsson <[e-mail]>
 Date: Mon, 26 Feb 2018 21:20:30 +0100
-Subject: Show scrollbar on first Language window if needed
+Subject: [PATCH] region: Show scrollbars if needed
 
 If we are initially showing more languages than can be fit, we should
 scroll then too.
 
+Bug: https://launchpad.net/bugs/1727710, https://launchpad.net/bugs/1758979
 Bug-Upstream: https://bugzilla.gnome.org/show_bug.cgi?id=793861
 Forwarded: https://gitlab.gnome.org/GNOME/gnome-control-center/merge_requests/12
 ---
- panels/common/cc-language-chooser.c | 8 --------
- panels/common/language-chooser.ui   | 3 ++-
- 2 files changed, 2 insertions(+), 9 deletions(-)
+ panels/common/cc-language-chooser.c |  8 --------
+ panels/common/language-chooser.ui   |  3 ++-
+ panels/region/cc-format-chooser.c   | 11 -----------
+ panels/region/cc-input-chooser.c    |  1 -
+ panels/region/format-chooser.ui     |  3 ++-
+ panels/region/input-chooser.ui      |  3 ++-
+ 6 files changed, 6 insertions(+), 23 deletions(-)
 
 diff --git a/panels/common/cc-language-chooser.c b/panels/common/cc-language-chooser.c
-index 961df5a..678c557 100644
+index 961df5a0a..678c557bb 100644
 --- a/panels/common/cc-language-chooser.c
 +++ b/panels/common/cc-language-chooser.c
 @@ -42,7 +42,6 @@ typedef struct {
@@ -52,7 +57,7 @@
          /* We ref-sink here so we can reuse this widget multiple times */
          priv->no_results = g_object_ref_sink (no_results_widget_new ());
 diff --git a/panels/common/language-chooser.ui b/panels/common/language-chooser.ui
-index c8228bb..8077e14 100644
+index c8228bbd9..8077e1487 100644
 --- a/panels/common/language-chooser.ui
 +++ b/panels/common/language-chooser.ui
 @@ -36,7 +36,8 @@
@@ -65,3 +70,92 @@
              <property name="shadow-type">in</property>
              <property name="margin-start">6</property>
              <property name="margin-end">6</property>
+diff --git a/panels/region/cc-format-chooser.c b/panels/region/cc-format-chooser.c
+index 4998de99d..8c451cb9c 100644
+--- a/panels/region/cc-format-chooser.c
++++ b/panels/region/cc-format-chooser.c
+@@ -41,7 +41,6 @@ typedef struct {
+         GtkListBoxRow *more_item;
+         GtkWidget *filter_entry;
+         GtkWidget *list;
+-        GtkWidget *scrolledwindow;
+         GtkWidget *date;
+         GtkWidget *time;
+         GtkWidget *date_time;
+@@ -421,18 +420,12 @@ static void
+ show_more (GtkDialog *chooser)
+ {
+         CcFormatChooserPrivate *priv = GET_PRIVATE (chooser);
+-        GtkWidget *widget;
+         gint width, height;
+ 
+         gtk_window_get_size (GTK_WINDOW (chooser), &width, &height);
+         gtk_widget_set_size_request (GTK_WIDGET (chooser), width, height);
+         gtk_window_set_resizable (GTK_WINDOW (chooser), TRUE);
+ 
+-        widget = priv->scrolledwindow;
+-        gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (widget),
+-                                        GTK_POLICY_NEVER,
+-                                        GTK_POLICY_AUTOMATIC);
+-
+         gtk_widget_show (priv->filter_entry);
+         gtk_widget_grab_focus (priv->filter_entry);
+ 
+@@ -526,7 +519,6 @@ cc_format_chooser_new (GtkWidget *parent)
+         priv->done_button = WID ("ok-button");
+         priv->filter_entry = WID ("region-filter-entry");
+         priv->list = WID ("region-list");
+-        priv->scrolledwindow = WID ("region-scrolledwindow");
+         priv->more_item = more_widget_new ();
+         /* We ref-sink here so we can reuse this widget multiple times */
+         priv->no_results = g_object_ref_sink (no_results_widget_new ());
+@@ -539,9 +531,6 @@ cc_format_chooser_new (GtkWidget *parent)
+         priv->measurement = WID ("measurement-format");
+         priv->paper = WID ("paper-format");
+ 
+-        gtk_list_box_set_adjustment (GTK_LIST_BOX (priv->list),
+-                                     gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (priv->scrolledwindow)));
+-
+         gtk_list_box_set_sort_func (GTK_LIST_BOX (priv->list),
+                                     (GtkListBoxSortFunc)sort_regions, chooser, NULL);
+         gtk_list_box_set_filter_func (GTK_LIST_BOX (priv->list),
+diff --git a/panels/region/cc-input-chooser.c b/panels/region/cc-input-chooser.c
+index a5156ccbf..393bd2587 100644
+--- a/panels/region/cc-input-chooser.c
++++ b/panels/region/cc-input-chooser.c
+@@ -1093,7 +1093,6 @@ cc_input_chooser_new (GtkWindow    *main_window,
+   priv->no_results = g_object_ref_sink (no_results_widget_new ());
+   gtk_widget_show_all (priv->no_results);
+ 
+-  gtk_list_box_set_adjustment (GTK_LIST_BOX (priv->list), priv->adjustment);
+   gtk_list_box_set_filter_func (GTK_LIST_BOX (priv->list), list_filter, chooser, NULL);
+   gtk_list_box_set_sort_func (GTK_LIST_BOX (priv->list), (GtkListBoxSortFunc)list_sort, chooser, NULL);
+   g_signal_connect (priv->list, "row-activated", G_CALLBACK (row_activated), chooser);
+diff --git a/panels/region/format-chooser.ui b/panels/region/format-chooser.ui
+index 363dc8400..fc574a87e 100644
+--- a/panels/region/format-chooser.ui
++++ b/panels/region/format-chooser.ui
+@@ -57,7 +57,8 @@
+                     <property name="can_focus">True</property>
+                     <property name="vexpand">True</property>
+                     <property name="hscrollbar_policy">never</property>
+-                    <property name="vscrollbar_policy">never</property>
++                    <property name="vscrollbar_policy">automatic</property>
++                    <property name="propagate-natural-height">True</property>
+                     <property name="shadow_type">in</property>
+                     <child>
+                       <object class="GtkViewport" id="viewport1">
+diff --git a/panels/region/input-chooser.ui b/panels/region/input-chooser.ui
+index 41f602edd..10fcbe538 100644
+--- a/panels/region/input-chooser.ui
++++ b/panels/region/input-chooser.ui
+@@ -37,7 +37,8 @@
+           <object class="GtkScrolledWindow" id="scrolledwindow">
+             <property name="visible">True</property>
+             <property name="hscrollbar-policy">never</property>
+-            <property name="vscrollbar-policy">never</property>
++            <property name="vscrollbar-policy">automatic</property>
++            <property name="propagate-natural-height">True</property>
+             <property name="shadow-type">in</property>
+             <property name="margin-start">6</property>
+             <property name="margin-end">6</property>

=== 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 @@
-0005-Show-scrollbar-on-first-Language-window-if-needed.patch
+0005-region-Show-scrollbars-if-needed.patch
 
 01_menu_category.patch
 06_handle_passwd_with_ldap.patch