From 19571cf3fdba826e8c631ad468fd96abb5be8c4a Mon Sep 17 00:00:00 2001
From: Rory Fewell <roryf@oddmatics.uk>
Date: Tue, 19 Aug 2025 22:10:26 +0100
Subject: [PATCH] Prelim: Further style improvements

---
 base/logonui/src/main.c             | 3 +++
 base/logonui/src/res/welcome-ui.css | 4 +++-
 base/logonui/src/res/welcome.ui     | 4 ++--
 base/logonui/src/res/welcphs1.ui    | 4 +++-
 base/logonui/src/res/welcphs2.ui    | 6 ++++--
 base/logonui/src/welcome/userlist.c | 2 +-
 6 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/base/logonui/src/main.c b/base/logonui/src/main.c
index 6c97b24..76fa31d 100644
--- a/base/logonui/src/main.c
+++ b/base/logonui/src/main.c
@@ -1,5 +1,6 @@
 #include <glib.h>
 #include <gtk/gtk.h>
+#include <wintc/comctl.h>
 #include <wintc/comgtk.h>
 
 #include "settings.h"
@@ -30,6 +31,8 @@ int main(
         NULL
     );
 
+    wintc_ctl_install_default_styles();
+
     // Create the window and launch
     //
     GtkWidget* window = wintc_logonui_window_new(settings);
diff --git a/base/logonui/src/res/welcome-ui.css b/base/logonui/src/res/welcome-ui.css
index e25f806..2a2fd3e 100644
--- a/base/logonui/src/res/welcome-ui.css
+++ b/base/logonui/src/res/welcome-ui.css
@@ -5,6 +5,7 @@
 
 .header-separator {
     background: linear-gradient(45deg, #5B7EDC, #C3D9FD 20%, #ADC6F6, #5A7EDC 90%);
+    min-height: 2px;
 }
 
 .content {
@@ -13,6 +14,7 @@
 
 .vertical-separator {
     background-image: linear-gradient(to bottom, #5B7EDC, #91AEEE, #5A7EDC );
+    min-width: 1px;
 }
 
 .footer {
@@ -21,6 +23,7 @@
 
 .footer-separator {
     background: linear-gradient(45deg, #5076D4, #F99736 20%, #C2814D, #00309C);
+    min-height: 2px;
 }
 
 
@@ -87,7 +90,6 @@
 }
 
 .user-label {
-    font-weight: 600;
     color: #ffffff;
     font-size: 14pt;
     font-family: Tahoma, inherit;
diff --git a/base/logonui/src/res/welcome.ui b/base/logonui/src/res/welcome.ui
index be3b215..2626be4 100644
--- a/base/logonui/src/res/welcome.ui
+++ b/base/logonui/src/res/welcome.ui
@@ -29,7 +29,6 @@
           <object class="GtkBox">
             <property name="visible">True</property>
             <property name="can-focus">False</property>
-            <property name="height-request">2</property>
 
             <style>
               <class name="header-separator" />
@@ -75,7 +74,6 @@
           <object class="GtkBox">
             <property name="visible">True</property>
             <property name="can-focus">False</property>
-            <property name="height-request">2</property>
 
             <style>
               <class name="footer-separator" />
@@ -141,6 +139,7 @@
 
                 <style>
                   <class name="undecorated" />
+                  <class name="wintc-ml-lg" />
                 </style>
               </object>
               <packing>
@@ -159,6 +158,7 @@ Just go to Control Panel and click User Accounts.</property>
 
                 <style>
                   <class name="logonui-text" />
+                  <class name="wintc-mr-lg" />
                 </style>
               </object>
               <packing>
diff --git a/base/logonui/src/res/welcphs1.ui b/base/logonui/src/res/welcphs1.ui
index 22737d0..0d113df 100644
--- a/base/logonui/src/res/welcphs1.ui
+++ b/base/logonui/src/res/welcphs1.ui
@@ -4,7 +4,8 @@
     <property name="visible">True</property>
     <property name="can-focus">False</property>
     <property name="halign">GTK_ALIGN_CENTER</property>
-    <property name="orientation">horizontal</property>
+    <property name="orientation">vertical</property>
+    <property name="valign">GTK_ALIGN_CENTER</property>
 
     <child>
       <object class="WinTCCtlAnimation" id="anim-logo-wait">
@@ -30,6 +31,7 @@
         <style>
           <class name="logonui-text" />
           <class name="logonui-instruction" />
+          <class name="wintc-mt-md" />
         </style>
       </object>
       <packing>
diff --git a/base/logonui/src/res/welcphs2.ui b/base/logonui/src/res/welcphs2.ui
index 30536f0..ed2dbe1 100644
--- a/base/logonui/src/res/welcphs2.ui
+++ b/base/logonui/src/res/welcphs2.ui
@@ -38,6 +38,7 @@
             <style>
               <class name="logonui-text" />
               <class name="logonui-instruction" />
+              <class name="wintc-mt-md" />
             </style>
           </object>
           <packing>
@@ -60,10 +61,11 @@
         <property name="visible">True</property>
         <property name="can-focus">False</property>
         <property name="orientation">vertical</property>
-        <property name="width-request">1</property>
 
         <style>
           <class name="vertical-separator" />
+          <class name="wintc-ml-lg" />
+          <class name="wintc-mr-lg" />
         </style>
       </object>
     </child>
@@ -73,7 +75,7 @@
       <object class="GtkBox">
         <property name="visible">True</property>
         <property name="can-focus">False</property>
-        <property name="orientation">vertical</property>
+        <property name="orientation">horizontal</property>
 
         <child>
           <object class="WinTCWelcomeUserList" id="user-list">
diff --git a/base/logonui/src/welcome/userlist.c b/base/logonui/src/welcome/userlist.c
index e32fdd0..208bd1e 100644
--- a/base/logonui/src/welcome/userlist.c
+++ b/base/logonui/src/welcome/userlist.c
@@ -779,7 +779,7 @@ static GtkWidget *build_userlist_widget(WinTCWelcomeUserList *user_list)
             g_object_unref(go_activated);
         }
 
-        gtk_style_context_add_class(gtk_widget_get_style_context(item->go_button), "plain-button");
+        gtk_style_context_add_class(gtk_widget_get_style_context(item->go_button), "undecorated");
         gtk_widget_set_can_focus(item->go_button, FALSE);
         gtk_widget_set_size_request(item->go_button, 22, 27);
         gtk_widget_set_margin_start(item->go_button, 13);