[gnome-calculator] buttons-programming: Make the bits more compact

From: Robert Roth <robertroth src gnome org>
To: commits-list gnome org
Cc:
Subject: [gnome-calculator] buttons-programming: Make the bits more compact
Date: Mon, 29 Mar 2021 17:34:55 +0000 (UTC)
commit 34e6ef1ebebe43c82d1c9ffced9e1ad70a5b87dc
Author: Adrien Plazas <kekun plazas laposte net>
Date:   Tue Mar 9 17:50:02 2021 +0100

    buttons-programming: Make the bits more compact
    
    This make them take almost half the inital width, enough to fit phones.

 src/ui/buttons-programming.ui | 228 +++++++++++++++++++++++++-----------------
 src/ui/calculator.css         |   1 +
 2 files changed, 136 insertions(+), 93 deletions(-)
---
diff --git a/src/ui/buttons-programming.ui b/src/ui/buttons-programming.ui
index 8a8bc965..26fa7edf 100644
--- a/src/ui/buttons-programming.ui
+++ b/src/ui/buttons-programming.ui
@@ -61,7 +61,7 @@
                 </style>
               </object>
               <packing>
-                <property name="left_attach">0</property>
+                <property name="left_attach">1</property>
               </packing>
             </child>
             <child>
@@ -78,7 +78,7 @@
                 </style>
               </object>
               <packing>
-                <property name="left_attach">1</property>
+                <property name="left_attach">2</property>
               </packing>
             </child>
             <child>
@@ -95,7 +95,7 @@
                 </style>
               </object>
               <packing>
-                <property name="left_attach">2</property>
+                <property name="left_attach">3</property>
               </packing>
             </child>
             <child>
@@ -113,8 +113,7 @@
                 </style>
               </object>
               <packing>
-                <property name="left_attach">3</property>
-                <property name="left_attach">3</property>
+                <property name="left_attach">4</property>
               </packing>
             </child>
             <child>
@@ -131,7 +130,7 @@
                 </style>
               </object>
               <packing>
-                <property name="left_attach">4</property>
+                <property name="left_attach">5</property>
               </packing>
             </child>
             <child>
@@ -148,7 +147,7 @@
                 </style>
               </object>
               <packing>
-                <property name="left_attach">5</property>
+                <property name="left_attach">6</property>
               </packing>
             </child>
             <child>
@@ -165,7 +164,7 @@
                 </style>
               </object>
               <packing>
-                <property name="left_attach">6</property>
+                <property name="left_attach">7</property>
               </packing>
             </child>
             <child>
@@ -183,7 +182,7 @@
                 </style>
               </object>
               <packing>
-                <property name="left_attach">7</property>
+                <property name="left_attach">8</property>
               </packing>
             </child>
             <child>
@@ -200,7 +199,7 @@
                 </style>
               </object>
               <packing>
-                <property name="left_attach">8</property>
+                <property name="left_attach">9</property>
               </packing>
             </child>
             <child>
@@ -217,7 +216,7 @@
                 </style>
               </object>
               <packing>
-                <property name="left_attach">9</property>
+                <property name="left_attach">10</property>
               </packing>
             </child>
             <child>
@@ -234,7 +233,7 @@
                 </style>
               </object>
               <packing>
-                <property name="left_attach">10</property>
+                <property name="left_attach">11</property>
               </packing>
             </child>
             <child>
@@ -252,7 +251,7 @@
                 </style>
               </object>
               <packing>
-                <property name="left_attach">11</property>
+                <property name="left_attach">12</property>
               </packing>
             </child>
             <child>
@@ -269,7 +268,7 @@
                 </style>
               </object>
               <packing>
-                <property name="left_attach">12</property>
+                <property name="left_attach">13</property>
               </packing>
             </child>
             <child>
@@ -286,7 +285,7 @@
                 </style>
               </object>
               <packing>
-                <property name="left_attach">13</property>
+                <property name="left_attach">14</property>
               </packing>
             </child>
             <child>
@@ -303,7 +302,7 @@
                 </style>
               </object>
               <packing>
-                <property name="left_attach">14</property>
+                <property name="left_attach">15</property>
               </packing>
             </child>
             <child>
@@ -311,7 +310,6 @@
                 <property name="visible">True</property>
                 <property name="label">0</property>
                 <property name="can_focus">False</property>
-                <property name="margin_end">10</property>
                 <property name="action_name">cal.toggle-bit</property>
                 <property name="action_target">15</property>
                 <property name="tooltip_text" translatable="no">48</property>
@@ -321,7 +319,7 @@
                 </style>
               </object>
               <packing>
-                <property name="left_attach">15</property>
+                <property name="left_attach">16</property>
               </packing>
             </child>
             <child>
@@ -338,7 +336,8 @@
                 </style>
               </object>
               <packing>
-                <property name="left_attach">31</property>
+                <property name="left_attach">16</property>
+                <property name="top_attach">1</property>
               </packing>
             </child>
             <child>
@@ -355,7 +354,8 @@
                 </style>
               </object>
               <packing>
-                <property name="left_attach">30</property>
+                <property name="left_attach">15</property>
+                <property name="top_attach">1</property>
               </packing>
             </child>
             <child>
@@ -372,7 +372,8 @@
                 </style>
               </object>
               <packing>
-                <property name="left_attach">29</property>
+                <property name="left_attach">14</property>
+                <property name="top_attach">1</property>
               </packing>
             </child>
             <child>
@@ -389,7 +390,8 @@
                 </style>
               </object>
               <packing>
-                <property name="left_attach">28</property>
+                <property name="left_attach">13</property>
+                <property name="top_attach">1</property>
               </packing>
             </child>
             <child>
@@ -407,7 +409,8 @@
                 </style>
               </object>
               <packing>
-                <property name="left_attach">27</property>
+                <property name="left_attach">12</property>
+                <property name="top_attach">1</property>
               </packing>
             </child>
             <child>
@@ -424,7 +427,8 @@
                 </style>
               </object>
               <packing>
-                <property name="left_attach">26</property>
+                <property name="left_attach">11</property>
+                <property name="top_attach">1</property>
               </packing>
             </child>
             <child>
@@ -441,7 +445,8 @@
                 </style>
               </object>
               <packing>
-                <property name="left_attach">25</property>
+                <property name="left_attach">10</property>
+                <property name="top_attach">1</property>
               </packing>
             </child>
             <child>
@@ -458,7 +463,8 @@
                 </style>
               </object>
               <packing>
-                <property name="left_attach">24</property>
+                <property name="left_attach">9</property>
+                <property name="top_attach">1</property>
               </packing>
             </child>
             <child>
@@ -476,7 +482,8 @@
                 </style>
               </object>
               <packing>
-                <property name="left_attach">23</property>
+                <property name="left_attach">8</property>
+                <property name="top_attach">1</property>
               </packing>
             </child>
             <child>
@@ -493,7 +500,8 @@
                 </style>
               </object>
               <packing>
-                <property name="left_attach">22</property>
+                <property name="left_attach">7</property>
+                <property name="top_attach">1</property>
               </packing>
             </child>
             <child>
@@ -510,7 +518,8 @@
                 </style>
               </object>
               <packing>
-                <property name="left_attach">21</property>
+                <property name="left_attach">6</property>
+                <property name="top_attach">1</property>
               </packing>
             </child>
             <child>
@@ -527,7 +536,8 @@
                 </style>
               </object>
               <packing>
-                <property name="left_attach">20</property>
+                <property name="left_attach">5</property>
+                <property name="top_attach">1</property>
               </packing>
             </child>
             <child>
@@ -545,7 +555,8 @@
                 </style>
               </object>
               <packing>
-                <property name="left_attach">19</property>
+                <property name="left_attach">4</property>
+                <property name="top_attach">1</property>
               </packing>
             </child>
             <child>
@@ -562,7 +573,8 @@
                 </style>
               </object>
               <packing>
-                <property name="left_attach">18</property>
+                <property name="left_attach">3</property>
+                <property name="top_attach">1</property>
               </packing>
             </child>
             <child>
@@ -579,7 +591,8 @@
                 </style>
               </object>
               <packing>
-                <property name="left_attach">17</property>
+                <property name="left_attach">2</property>
+                <property name="top_attach">1</property>
               </packing>
             </child>
             <child>
@@ -596,7 +609,8 @@
                 </style>
               </object>
               <packing>
-                <property name="left_attach">16</property>
+                <property name="left_attach">1</property>
+                <property name="top_attach">1</property>
               </packing>
             </child>
             <child>
@@ -612,8 +626,6 @@
               </object>
               <packing>
                 <property name="left_attach">0</property>
-                <property name="top_attach">1</property>
-                <property name="width">16</property>
               </packing>
             </child>
             <child>
@@ -629,8 +641,24 @@
               </object>
               <packing>
                 <property name="left_attach">0</property>
-                <property name="top_attach">3</property>
-                <property name="width">16</property>
+                <property name="top_attach">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel">
+                <property name="visible">True</property>
+                <property name="halign">start</property>
+                <property name="label">48</property>
+                <property name="justify">center</property>
+                <style>
+                  <class name="dim-label"/>
+                  <class name="bit-marker-label"/>
+                </style>
+              </object>
+              <packing>
+                <property name="left_attach">17</property>
+                <property name="top_attach">0</property>
+                <property name="width">2</property>
               </packing>
             </child>
             <child>
@@ -645,11 +673,28 @@
                 </style>
               </object>
               <packing>
-                <property name="left_attach">31</property>
+                <property name="left_attach">17</property>
                 <property name="top_attach">1</property>
                 <property name="width">2</property>
               </packing>
             </child>
+            <child>
+              <object class="GtkLabel">
+                <property name="visible">True</property>
+                <property name="halign">start</property>
+                <property name="label">16</property>
+                <property name="justify">center</property>
+                <style>
+                  <class name="dim-label"/>
+                  <class name="bit-marker-label"/>
+                </style>
+              </object>
+              <packing>
+                <property name="left_attach">17</property>
+                <property name="top_attach">2</property>
+                <property name="width">2</property>
+              </packing>
+            </child>
             <child>
               <object class="GtkLabel" id="bit_marker_label5">
                 <property name="visible">True</property>
@@ -662,7 +707,7 @@
                 </style>
               </object>
               <packing>
-                <property name="left_attach">31</property>
+                <property name="left_attach">17</property>
                 <property name="top_attach">3</property>
                 <property name="width">2</property>
               </packing>
@@ -681,7 +726,7 @@
                 </style>
               </object>
               <packing>
-                <property name="left_attach">0</property>
+                <property name="left_attach">1</property>
                 <property name="top_attach">2</property>
               </packing>
             </child>
@@ -699,7 +744,7 @@
                 </style>
               </object>
               <packing>
-                <property name="left_attach">1</property>
+                <property name="left_attach">2</property>
                 <property name="top_attach">2</property>
               </packing>
             </child>
@@ -717,7 +762,7 @@
                 </style>
               </object>
               <packing>
-                <property name="left_attach">2</property>
+                <property name="left_attach">3</property>
                 <property name="top_attach">2</property>
               </packing>
             </child>
@@ -736,7 +781,7 @@
                 </style>
               </object>
               <packing>
-                <property name="left_attach">3</property>
+                <property name="left_attach">4</property>
                 <property name="top_attach">2</property>
               </packing>
             </child>
@@ -754,7 +799,7 @@
                 </style>
               </object>
               <packing>
-                <property name="left_attach">4</property>
+                <property name="left_attach">5</property>
                 <property name="top_attach">2</property>
               </packing>
             </child>
@@ -772,7 +817,7 @@
                 </style>
               </object>
               <packing>
-                <property name="left_attach">5</property>
+                <property name="left_attach">6</property>
                 <property name="top_attach">2</property>
               </packing>
             </child>
@@ -790,7 +835,7 @@
                 </style>
               </object>
               <packing>
-                <property name="left_attach">6</property>
+                <property name="left_attach">7</property>
                 <property name="top_attach">2</property>
               </packing>
             </child>
@@ -809,7 +854,7 @@
                 </style>
               </object>
               <packing>
-                <property name="left_attach">7</property>
+                <property name="left_attach">8</property>
                 <property name="top_attach">2</property>
               </packing>
             </child>
@@ -827,7 +872,7 @@
                 </style>
               </object>
               <packing>
-                <property name="left_attach">8</property>
+                <property name="left_attach">9</property>
                 <property name="top_attach">2</property>
               </packing>
             </child>
@@ -845,7 +890,7 @@
                 </style>
               </object>
               <packing>
-                <property name="left_attach">9</property>
+                <property name="left_attach">10</property>
                 <property name="top_attach">2</property>
               </packing>
             </child>
@@ -863,7 +908,7 @@
                 </style>
               </object>
               <packing>
-                <property name="left_attach">10</property>
+                <property name="left_attach">11</property>
                 <property name="top_attach">2</property>
               </packing>
             </child>
@@ -882,7 +927,7 @@
                 </style>
               </object>
               <packing>
-                <property name="left_attach">11</property>
+                <property name="left_attach">12</property>
                 <property name="top_attach">2</property>
               </packing>
             </child>
@@ -900,7 +945,7 @@
                 </style>
               </object>
               <packing>
-                <property name="left_attach">12</property>
+                <property name="left_attach">13</property>
                 <property name="top_attach">2</property>
               </packing>
             </child>
@@ -918,7 +963,7 @@
                 </style>
               </object>
               <packing>
-                <property name="left_attach">13</property>
+                <property name="left_attach">14</property>
                 <property name="top_attach">2</property>
               </packing>
             </child>
@@ -936,7 +981,7 @@
                 </style>
               </object>
               <packing>
-                <property name="left_attach">14</property>
+                <property name="left_attach">15</property>
                 <property name="top_attach">2</property>
               </packing>
             </child>
@@ -945,7 +990,6 @@
                 <property name="visible">True</property>
                 <property name="label">0</property>
                 <property name="can_focus">False</property>
-                <property name="margin_end">10</property>
                 <property name="action_name">cal.toggle-bit</property>
                 <property name="action_target">47</property>
                 <property name="tooltip_text" translatable="no">16</property>
@@ -955,7 +999,7 @@
                 </style>
               </object>
               <packing>
-                <property name="left_attach">15</property>
+                <property name="left_attach">16</property>
                 <property name="top_attach">2</property>
               </packing>
             </child>
@@ -973,8 +1017,8 @@
                 </style>
               </object>
               <packing>
-                <property name="left_attach">16</property>
-                <property name="top_attach">2</property>
+                <property name="left_attach">1</property>
+                <property name="top_attach">3</property>
               </packing>
             </child>
             <child>
@@ -991,8 +1035,8 @@
                 </style>
               </object>
               <packing>
-                <property name="left_attach">17</property>
-                <property name="top_attach">2</property>
+                <property name="left_attach">2</property>
+                <property name="top_attach">3</property>
               </packing>
             </child>
             <child>
@@ -1009,8 +1053,8 @@
                 </style>
               </object>
               <packing>
-                <property name="left_attach">18</property>
-                <property name="top_attach">2</property>
+                <property name="left_attach">3</property>
+                <property name="top_attach">3</property>
               </packing>
             </child>
             <child>
@@ -1028,8 +1072,8 @@
                 </style>
               </object>
               <packing>
-                <property name="left_attach">19</property>
-                <property name="top_attach">2</property>
+                <property name="left_attach">4</property>
+                <property name="top_attach">3</property>
               </packing>
             </child>
             <child>
@@ -1046,8 +1090,8 @@
                 </style>
               </object>
               <packing>
-                <property name="left_attach">20</property>
-                <property name="top_attach">2</property>
+                <property name="left_attach">5</property>
+                <property name="top_attach">3</property>
               </packing>
             </child>
             <child>
@@ -1064,8 +1108,8 @@
                 </style>
               </object>
               <packing>
-                <property name="left_attach">21</property>
-                <property name="top_attach">2</property>
+                <property name="left_attach">6</property>
+                <property name="top_attach">3</property>
               </packing>
             </child>
             <child>
@@ -1082,8 +1126,8 @@
                 </style>
               </object>
               <packing>
-                <property name="left_attach">22</property>
-                <property name="top_attach">2</property>
+                <property name="left_attach">7</property>
+                <property name="top_attach">3</property>
               </packing>
             </child>
             <child>
@@ -1101,8 +1145,8 @@
                 </style>
               </object>
               <packing>
-                <property name="left_attach">23</property>
-                <property name="top_attach">2</property>
+                <property name="left_attach">8</property>
+                <property name="top_attach">3</property>
               </packing>
             </child>
             <child>
@@ -1119,8 +1163,8 @@
                 </style>
               </object>
               <packing>
-                <property name="left_attach">24</property>
-                <property name="top_attach">2</property>
+                <property name="left_attach">9</property>
+                <property name="top_attach">3</property>
               </packing>
             </child>
             <child>
@@ -1137,8 +1181,8 @@
                 </style>
               </object>
               <packing>
-                <property name="left_attach">25</property>
-                <property name="top_attach">2</property>
+                <property name="left_attach">10</property>
+                <property name="top_attach">3</property>
               </packing>
             </child>
             <child>
@@ -1155,8 +1199,8 @@
                 </style>
               </object>
               <packing>
-                <property name="left_attach">26</property>
-                <property name="top_attach">2</property>
+                <property name="left_attach">11</property>
+                <property name="top_attach">3</property>
               </packing>
             </child>
             <child>
@@ -1174,8 +1218,8 @@
                 </style>
               </object>
               <packing>
-                <property name="left_attach">27</property>
-                <property name="top_attach">2</property>
+                <property name="left_attach">12</property>
+                <property name="top_attach">3</property>
               </packing>
             </child>
             <child>
@@ -1192,8 +1236,8 @@
                 </style>
               </object>
               <packing>
-                <property name="left_attach">28</property>
-                <property name="top_attach">2</property>
+                <property name="left_attach">13</property>
+                <property name="top_attach">3</property>
               </packing>
             </child>
             <child>
@@ -1210,8 +1254,8 @@
                 </style>
               </object>
               <packing>
-                <property name="left_attach">29</property>
-                <property name="top_attach">2</property>
+                <property name="left_attach">14</property>
+                <property name="top_attach">3</property>
               </packing>
             </child>
             <child>
@@ -1228,8 +1272,8 @@
                 </style>
               </object>
               <packing>
-                <property name="left_attach">30</property>
-                <property name="top_attach">2</property>
+                <property name="left_attach">15</property>
+                <property name="top_attach">3</property>
               </packing>
             </child>
             <child>
@@ -1246,8 +1290,8 @@
                 </style>
               </object>
               <packing>
-                <property name="left_attach">31</property>
-                <property name="top_attach">2</property>
+                <property name="left_attach">16</property>
+                <property name="top_attach">3</property>
               </packing>
             </child>
             <child>
@@ -1262,9 +1306,8 @@
                 </style>
               </object>
               <packing>
-                <property name="left_attach">16</property>
+                <property name="left_attach">0</property>
                 <property name="top_attach">1</property>
-                <property name="width">16</property>
               </packing>
             </child>
             <child>
@@ -1279,9 +1322,8 @@
                 </style>
               </object>
               <packing>
-                <property name="left_attach">16</property>
+                <property name="left_attach">0</property>
                 <property name="top_attach">3</property>
-                <property name="width">16</property>
               </packing>
             </child>
           </object>
diff --git a/src/ui/calculator.css b/src/ui/calculator.css
index 73a25ced..ac19e281 100644
--- a/src/ui/calculator.css
+++ b/src/ui/calculator.css
@@ -80,6 +80,7 @@ window > deck > box > clamp > grid > mathconverter {
 }
 
 .bit-marker-label {
+  margin: 0 12px;
 }
 
 .history-view {
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]