[gnome-control-center/T20818: 16/54] power: adapt to low resolution screens

[Georges Basile Stavracas Neto <gbsneto src gnome org>]

commit 7d67158707a06e706d4b69f29de9237dd2d0ee75
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date:   Thu Jul 7 14:35:57 2016 -0300

    power: adapt to low resolution screens
    
    The Energy panel, after the rebase, received some interface
    elements that were not appliable on low resolution screens.
    
    Fix that by adapting the long label, and using the CcShell's
    is_small_screen() function to check whether the scrollbars
    should be visible or not.
    
    https://phabricator.endlessm.com/T12169

 panels/power/cc-power-panel.c |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/panels/power/cc-power-panel.c b/panels/power/cc-power-panel.c
index 38c5942..7bc60e8 100644
--- a/panels/power/cc-power-panel.c
+++ b/panels/power/cc-power-panel.c
@@ -1848,6 +1848,7 @@ add_power_saving_section (CcPowerPanel *self)
 
   w = gtk_label_new (_("Turn off mobile broadband (3G, 4G, LTE, etc.) to save power."));
   gtk_widget_set_halign (w, GTK_ALIGN_START);
+  gtk_label_set_ellipsize (GTK_LABEL (w), PANGO_ELLIPSIZE_END);
   gtk_style_context_add_class (gtk_widget_get_style_context (w), GTK_STYLE_CLASS_DIM_LABEL);
   gtk_box_pack_start (GTK_BOX (box2), w, TRUE, TRUE, 0);
 
@@ -2430,10 +2431,14 @@ add_device_section (CcPowerPanel *self)
 static void
 on_content_size_changed (GtkWidget *widget, GtkAllocation *allocation, gpointer data)
 {
+  CcPowerPanel *self = data;
   GtkWidget *box;
+  CcShell *shell;
 
+  shell = cc_panel_get_shell (CC_PANEL (self));
   box = gtk_widget_get_parent (gtk_widget_get_parent (widget));
-  if (allocation->height < 490)
+
+  if (cc_shell_is_small_screen (shell))
     {
       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (box),
                                       GTK_POLICY_NEVER, GTK_POLICY_NEVER);
@@ -2442,7 +2447,7 @@ on_content_size_changed (GtkWidget *widget, GtkAllocation *allocation, gpointer
     {
       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (box),
                                       GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
-      gtk_scrolled_window_set_min_content_height (GTK_SCROLLED_WINDOW (box), 490);
+      gtk_scrolled_window_set_min_content_height (GTK_SCROLLED_WINDOW (box), 360);
     }
 }
 
@@ -2532,7 +2537,7 @@ cc_power_panel_init (CcPowerPanel *self)
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (box),
                                   GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
   g_signal_connect (widget, "size-allocate",
-                    G_CALLBACK (on_content_size_changed), NULL);
+                    G_CALLBACK (on_content_size_changed), self);
   gtk_widget_show (box);
   gtk_container_add (GTK_CONTAINER (self), box);
   gtk_container_add (GTK_CONTAINER (box), widget);