From 987e945e6b1aabbaac4568af055f064ec58ff36d Mon Sep 17 00:00:00 2001 From: Adrien Plazas Date: Mon, 24 Sep 2018 13:52:17 +0200 Subject: [PATCH] settings-widget: Drop the scrolled window and the margins This gives more freedom to the Settings application on how to implement its Bluetooth panel. --- lib/bluetooth-settings-widget.c | 4 +-- lib/settings.ui | 51 ++++++++++++--------------------- 2 files changed, 19 insertions(+), 36 deletions(-) diff --git a/lib/bluetooth-settings-widget.c b/lib/bluetooth-settings-widget.c index 78804181..d056b370 100644 --- a/lib/bluetooth-settings-widget.c +++ b/lib/bluetooth-settings-widget.c @@ -1902,7 +1902,7 @@ bluetooth_settings_widget_init (BluetoothSettingsWidget *self) return; } - widget = WID ("scrolledwindow1"); + widget = WID ("vbox_bluetooth"); priv->connecting_devices = g_hash_table_new_full (g_str_hash, g_str_equal, @@ -1939,8 +1939,6 @@ bluetooth_settings_widget_init (BluetoothSettingsWidget *self) add_device_section (self); gtk_widget_set_hexpand (widget, TRUE); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (widget), - GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); gtk_container_add (GTK_CONTAINER (self), widget); setup_properties_dialog (self); diff --git a/lib/settings.ui b/lib/settings.ui index 8129004a..3eb21436 100644 --- a/lib/settings.ui +++ b/lib/settings.ui @@ -364,44 +364,29 @@ - + True - True + False + vertical - + True False - - - True - False - vertical - 128 - 128 - - - True - False - start - 32 - 12 - Visible as “Bastien's computer” and available for Bluetooth file transfers. Transferred files are placed in the <a href="http://www.gnome.org">Downloads</a> folder. - True - fill - True - - - False - True - 0 - - - - - - - + start + Visible as “Bastien's computer” and available for Bluetooth file transfers. Transferred files are placed in the <a href="http://www.gnome.org">Downloads</a> folder. + True + fill + True + + False + True + 0 + + + + + -- GitLab