[gnome-games/wip/exalm/actions: 9/11] error-display: Simplify layout



commit ade7211d02ef6078cf4aa76295dd20d7b3678acb
Author: Alexander Mikhaylenko <alexm gnome org>
Date:   Sun Jan 26 21:59:33 2020 +0500

    error-display: Simplify layout
    
    Also get rid of markup.

 data/ui/error-display.ui  | 45 ++++++++++++++++++++-------------------------
 src/ui/error-display.vala |  4 ++--
 2 files changed, 22 insertions(+), 27 deletions(-)
---
diff --git a/data/ui/error-display.ui b/data/ui/error-display.ui
index 37c45a4e..dd61af6f 100644
--- a/data/ui/error-display.ui
+++ b/data/ui/error-display.ui
@@ -6,43 +6,38 @@
     <property name="orientation">vertical</property>
     <property name="halign">center</property>
     <property name="valign">center</property>
+    <property name="spacing">12</property>
     <child>
       <object class="GtkImage" id="icon">
         <property name="visible">True</property>
-        <property name="valign">center</property>
         <property name="pixel-size">128</property>
         <property name="icon-name">face-uncertain-symbolic</property>
-        <property name="icon-size">0</property>
-        <property name="margin-bottom">18</property>
+        <property name="margin-bottom">6</property>
         <style>
           <class name="dim-label"/>
         </style>
       </object>
     </child>
     <child>
-      <object class="GtkBox" id="box">
+      <object class="GtkLabel" id="primary_label">
         <property name="visible">True</property>
-        <property name="orientation">vertical</property>
-        <property name="spacing">12</property>
-        <child>
-          <object class="GtkLabel" id="primary_label">
-            <property name="visible">True</property>
-            <property name="opacity">0.5</property>
-            <property name="halign">center</property>
-            <property name="valign">center</property>
-            <property name="use-markup">True</property>
-            <property name="wrap">True</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkLabel" id="secondary_label">
-            <property name="visible">True</property>
-            <property name="halign">center</property>
-            <property name="valign">center</property>
-            <property name="use-markup">True</property>
-            <property name="wrap">True</property>
-          </object>
-        </child>
+        <property name="halign">center</property>
+        <property name="wrap">True</property>
+        <style>
+          <class name="dim-label"/>
+        </style>
+        <attributes>
+          <attribute name="weight" value="bold"/>
+          <!-- "1.2" is the value of "large" -->
+          <attribute name="scale" value="1.2"/>
+        </attributes>
+      </object>
+    </child>
+    <child>
+      <object class="GtkLabel" id="secondary_label">
+        <property name="visible">True</property>
+        <property name="halign">center</property>
+        <property name="wrap">True</property>
       </object>
     </child>
   </template>
diff --git a/src/ui/error-display.vala b/src/ui/error-display.vala
index 97473ff8..6369ef08 100644
--- a/src/ui/error-display.vala
+++ b/src/ui/error-display.vala
@@ -18,7 +18,7 @@ private class Games.ErrorDisplay : Gtk.Box {
        }
 
        private void set_labels (string primary, string secondary) {
-               primary_label.label = @"<big><b>$(Markup.escape_text (primary))</b></big>";
-               secondary_label.label = Markup.escape_text (secondary);
+               primary_label.label = primary;
+               secondary_label.label = secondary;
        }
 }


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