From 4ea8e5013c3ed5b8631539f7ffd154b726519357 Mon Sep 17 00:00:00 2001
From: Nicolas Salguero <nicolas.salguero@laposte.net>
Date: Wed, 16 Mar 2016 16:26:20 +0100
Subject: - adapt to mga5 default background, which is darker than the
 preceding ones - add a scrollbar to the list of users to show all users

---
 greeter-gtk3.ui | 47 ++++++++++++++++++++++-------------------------
 greeter.ui      | 51 +++++++++++++++++++++++++++++----------------------
 gtkrc           |  2 +-
 3 files changed, 52 insertions(+), 48 deletions(-)

diff --git a/greeter-gtk3.ui b/greeter-gtk3.ui
index 483809c..d0cb4d2 100644
--- a/greeter-gtk3.ui
+++ b/greeter-gtk3.ui
@@ -31,11 +31,16 @@
                 <property name="visible">True</property>
                 <property name="orientation">vertical</property>
                 <child>
-                  <object class="GtkImage" id="image1">
+                  <object class="GtkLabel" id="prompt">
                     <property name="visible">True</property>
-                    <property name="pixbuf">login.png</property>
+                    <property name="label" translatable="yes">User:</property>
+                    <property name="xpad">18</property>
+                    <property name="ypad">18</property>
+                    <property name="yalign">0.2</property>
                   </object>
                   <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
                     <property name="position">0</property>
                   </packing>
                 </child>
@@ -49,31 +54,23 @@
                         <property name="visible">True</property>
                         <property name="spacing">12</property>
                         <child>
-                          <object class="GtkLabel" id="prompt">
+                          <object class="GtkScrolledWindow" id="user_list_scrolled">
                             <property name="visible">True</property>
-                            <property name="label" translatable="yes">User:</property>
-                            <property name="yalign">0.2</property>
+                            <property name="can_focus">False</property>
+                            <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
+                            <property name="vscrollbar_policy">GTK_POLICY_NEVER</property>
+                            <property name="height_request">180</property>
+                            <child>
+                              <object class="GtkIconView" id="user_list">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="item-padding">1</property>
+                                <property name="margin">2</property>
+                                <property name="column-spacing">0</property>
+                                <property name="row-spacing">1</property>
+                              </object>
+                            </child>
                           </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkIconView" id="user_list">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="item-padding">1</property>
-                            <property name="margin">2</property>
-                            <property name="column-spacing">0</property>
-                            <property name="row-spacing">1</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">1</property>
-                          </packing>
                         </child>
                         <child>
                           <object class="GtkEntry" id="login_entry">
diff --git a/greeter.ui b/greeter.ui
index 449da0e..e63b34b 100644
--- a/greeter.ui
+++ b/greeter.ui
@@ -30,17 +30,20 @@
               <object class="GtkVBox" id="vbox2">
                 <property name="visible">True</property>
                 <property name="orientation">vertical</property>
-		<child>
-		  <object class="GtkLabel" id="prompt">
-		    <property name="visible">True</property>
-		    <property name="label" translatable="yes">User:</property>
-		    <property name="xpad">18</property>
-		    <property name="ypad">18</property>
-		  </object>
-		  <packing>
-		    <property name="position">0</property>
-		  </packing>
-		</child>
+                <child>
+                  <object class="GtkLabel" id="prompt">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">User:</property>
+                    <property name="xpad">18</property>
+                    <property name="ypad">18</property>
+                    <property name="yalign">0.2</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
                 <child>
                   <object class="GtkAlignment" id="alignment2">
                     <property name="visible">True</property>
@@ -51,19 +54,23 @@
                         <property name="visible">True</property>
                         <property name="spacing">12</property>
                         <child>
-                          <object class="GtkIconView" id="user_list">
+                          <object class="GtkScrolledWindow" id="user_list_scrolled">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="item-padding">1</property>
-			    <property name="margin">2</property>
-                            <property name="column-spacing">0</property>
-                            <property name="row-spacing">1</property>
+                            <property name="can_focus">False</property>
+                            <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
+                            <property name="vscrollbar_policy">GTK_POLICY_NEVER</property>
+                            <property name="height_request">180</property>
+                            <child>
+                              <object class="GtkIconView" id="user_list">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="item-padding">1</property>
+                                <property name="margin">2</property>
+                                <property name="column-spacing">0</property>
+                                <property name="row-spacing">1</property>
+                              </object>
+                            </child>
                           </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">0</property>
-                          </packing>
                         </child>
                         <child>
                           <object class="GtkEntry" id="login_entry">
diff --git a/gtkrc b/gtkrc
index d50ca65..79f6aa6 100644
--- a/gtkrc
+++ b/gtkrc
@@ -45,6 +45,6 @@ style "bottom"
 
 widget "lxdm" style "back"
 widget "lxdm.*.time" style "time"
-widget "lxdm.*.prompt" style "prompt"
+widget "*.prompt" style "prompt"
 widget "lxdm.*.bottom_pane" style "bottom"
 widget_class "GtkWindow.*.GtkEventBox.*.<GtkLabel>" style "bottom"
-- 
cgit v1.2.1