[gnome-builder/wip/gtk4-port: 217/1774] libide/greeter: make greeter basics work




commit 9ee2400faa53639bb561dd87ee2687264bbf230f
Author: Christian Hergert <chergert redhat com>
Date:   Wed Mar 30 15:40:07 2022 -0700

    libide/greeter: make greeter basics work

 src/libide/greeter/ide-greeter-workspace.ui | 29 ++++++++++++++---------------
 src/plugins/greeter/gtk/menus.ui            |  2 +-
 2 files changed, 15 insertions(+), 16 deletions(-)
---
diff --git a/src/libide/greeter/ide-greeter-workspace.ui b/src/libide/greeter/ide-greeter-workspace.ui
index b64d34681..1dc0ae5dc 100644
--- a/src/libide/greeter/ide-greeter-workspace.ui
+++ b/src/libide/greeter/ide-greeter-workspace.ui
@@ -47,29 +47,30 @@
         </child>
       </object>
     </child>
-    <child internal-child="surfaces">
-      <object class="GtkStack" id="surfaces">
+    <child>
+      <object class="GtkStack" id="pages">
         <property name="transition-type">crossfade</property>
         <signal name="notify::visible-child" handler="stack_notify_visible_child_cb" 
object="IdeGreeterWorkspace" swapped="true"/>
         <child>
-          <object class="IdeSurface" id="sections_surface">
+          <object class="GtkStackPage">
+            <property name="name">overview</property>
             <property name="title" translatable="yes" context="title">Open a Project</property>
-            <style>
-              <class name="sectionssurface"/>
-            </style>
-            <child>
+            <property name="child">
               <object class="GtkBox">
                 <property name="orientation">vertical</property>
                 <child>
                   <object class="GtkScrolledWindow">
-                    <property name="expand">true</property>
+                    <property name="vexpand">true</property>
                     <property name="hscrollbar-policy">never</property>
                     <child>
                       <object class="GtkViewport">
-                        <property name="expand">true</property>
+                        <property name="vexpand">true</property>
                         <child>
                           <object class="GtkBox">
-                            <property name="margin">32</property>
+                            <property name="margin-top">32</property>
+                            <property name="margin-start">32</property>
+                            <property name="margin-end">32</property>
+                            <property name="margin-bottom">32</property>
                             <property name="orientation">vertical</property>
                             <property name="spacing">24</property>
                             <child>
@@ -100,7 +101,7 @@
                 </child>
                 <child>
                   <object class="GtkActionBar" id="projects_action_bar">
-                    <child>
+                    <child type="center">
                       <object class="IdeGreeterButtonsSection" id="buttons_section">
                         <property name="halign">center</property>
                       </object>
@@ -109,6 +110,7 @@
                 </child>
                 <child>
                   <object class="GtkActionBar" id="action_bar">
+                    <property name="visible">false</property>
                     <child type="center">
                       <object class="GtkBox">
                         <property name="width-request">600</property>
@@ -144,10 +146,7 @@
                   </object>
                 </child>
               </object>
-            </child>
-            <layout>
-              <property name="name">overview</property>
-            </layout>
+            </property>
           </object>
         </child>
       </object>
diff --git a/src/plugins/greeter/gtk/menus.ui b/src/plugins/greeter/gtk/menus.ui
index d19a42365..458ef2969 100644
--- a/src/plugins/greeter/gtk/menus.ui
+++ b/src/plugins/greeter/gtk/menus.ui
@@ -26,7 +26,7 @@
       <item>
         <attribute name="id">ide-greeter-workspace-menu-shortcuts</attribute>
         <attribute name="label" translatable="yes">Keyboard Shortcuts</attribute>
-        <attribute name="action">app.shortcuts</attribute>
+        <attribute name="action">win.show-help-overlay</attribute>
         <attribute name="accel">&lt;primary&gt;question</attribute>
       </item>
       <item>


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]