[gnome-system-monitor] Better alignment for network stats on Resources (bgo#789603)

[Robert Roth <robertroth src gnome org>]

commit 758cd9a347b2d07fd9436b7440edb7d2c6e61767
Author: Robert Roth <robert roth off gmail com>
Date:   Sat Feb 3 19:36:21 2018 +0200

    Better alignment for network stats on Resources (bgo#789603)

 data/interface.ui |   12 ++++++------
 src/interface.cpp |    9 +++++++++
 2 files changed, 15 insertions(+), 6 deletions(-)
---
diff --git a/data/interface.ui b/data/interface.ui
index bab80c8..80edfa8 100644
--- a/data/interface.ui
+++ b/data/interface.ui
@@ -183,7 +183,7 @@
                     <property name="vexpand">True</property>
                     <property name="border_width">8</property>
                     <property name="orientation">vertical</property>
-                    <property name="spacing">8</property>
+                    <property name="spacing">10</property>
                     <child>
                       <object class="GtkLabel" id="cpu_label">
                         <property name="visible">True</property>
@@ -376,7 +376,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="margin_start">54</property>
-                            <property name="margin_end">38</property>
+                            <property name="margin_end">12</property>
                             <property name="hexpand">True</property>
                             <property name="row_spacing">0</property>
                             <property name="column_spacing">6</property>
@@ -385,7 +385,7 @@
                               <object class="GtkLabel" id="receiving_label">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="hexpand">True</property>
+                                <property name="hexpand">False</property>
                                 <property name="halign">start</property>
                                 <property name="label" translatable="yes">Receiving</property>
                               </object>
@@ -400,7 +400,7 @@
                               <object class="GtkLabel" id="total_received_label">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="hexpand">True</property>
+                                <property name="hexpand">False</property>
                                 <property name="halign">start</property>
                                 <property name="label" translatable="yes">Total Received</property>
                               </object>
@@ -415,7 +415,7 @@
                               <object class="GtkLabel" id="sending_label">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="hexpand">True</property>
+                                <property name="hexpand">False</property>
                                 <property name="halign">start</property>
                                 <property name="label" translatable="yes">Sending</property>
                               </object>
@@ -430,7 +430,7 @@
                               <object class="GtkLabel" id="total_sent_label">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="hexpand">True</property>
+                                <property name="hexpand">False</property>
                                 <property name="halign">start</property>
                                 <property name="label" translatable="yes">Total Sent</property>
                               </object>
diff --git a/src/interface.cpp b/src/interface.cpp
index f8a747a..7d0c449 100644
--- a/src/interface.cpp
+++ b/src/interface.cpp
@@ -326,6 +326,9 @@ create_sys_view (GsmApplication *app, GtkBuilder * builder)
     color_picker = gsm_color_button_new (
         &net_graph->colors.at(1), GSMCP_TYPE_NETWORK_OUT);
     gtk_widget_set_valign (GTK_WIDGET(color_picker), GTK_ALIGN_CENTER);
+    gtk_widget_set_hexpand (GTK_WIDGET(color_picker), true);
+    gtk_widget_set_halign (GTK_WIDGET(color_picker), GTK_ALIGN_END);
+
     g_signal_connect (G_OBJECT (color_picker), "color-set",
                       G_CALLBACK (cb_net_out_color_changed), app);
     title_text = g_strdup_printf(title_template, _("Sending"));
@@ -337,6 +340,12 @@ create_sys_view (GsmApplication *app, GtkBuilder * builder)
     gtk_grid_attach_next_to (table, GTK_WIDGET (load_graph_get_labels(net_graph)->net_out), GTK_WIDGET 
(label), GTK_POS_RIGHT, 1, 1);
     label = GTK_LABEL (gtk_builder_get_object(builder, "total_sent_label"));
     gtk_grid_attach_next_to (table, GTK_WIDGET (load_graph_get_labels(net_graph)->net_out_total), GTK_WIDGET 
(label), GTK_POS_RIGHT, 1, 1);
+    gtk_widget_set_hexpand (GTK_WIDGET(load_graph_get_labels(net_graph)->net_out_total), true);
+    gtk_widget_set_halign (GTK_WIDGET(load_graph_get_labels(net_graph)->net_out_total), GTK_ALIGN_START);
+
+    gtk_widget_set_hexpand (GTK_WIDGET(load_graph_get_labels(net_graph)->net_out), true);
+    gtk_widget_set_halign (GTK_WIDGET(load_graph_get_labels(net_graph)->net_out), GTK_ALIGN_START);
+
 
     app->net_graph = net_graph;
     g_free (title_template);