[gnome-clocks/bilelmoussaoui/timer-fixes] timer: fix rounder buttons and use round char



commit 4e6552ff8dac5d414cc220ca9af75ad10cbee8f6
Author: Tobias Bernard <tbernard gnome org>
Date:   Sat Feb 1 18:17:21 2020 +0100

    timer: fix rounder buttons and use round char

 data/css/gnome-clocks.css | 7 +++++--
 data/ui/timer_row.ui      | 7 ++++---
 data/ui/timer_setup.ui    | 2 +-
 src/timer.vala            | 2 +-
 4 files changed, 11 insertions(+), 7 deletions(-)
---
diff --git a/data/css/gnome-clocks.css b/data/css/gnome-clocks.css
index 29eae7e..f0dee89 100644
--- a/data/css/gnome-clocks.css
+++ b/data/css/gnome-clocks.css
@@ -228,11 +228,14 @@ spinbutton.clocks-timer-label button {
     animation-duration: 1s; 
 }
 
-.round-button {
+.timer-panel .round-button {
   border-radius: 9999px;
 }
+.timer-panel .small-button {
+  padding: 5px 9px
+}
 .timer-panel .large-button {
-  padding: 12px 18px;
+  padding: 12px 16px;
 }
 .timer-countdown {
   font-size: 40pt;
diff --git a/data/ui/timer_row.ui b/data/ui/timer_row.ui
index ea964b6..985afec 100644
--- a/data/ui/timer_row.ui
+++ b/data/ui/timer_row.ui
@@ -18,7 +18,7 @@
           <object class="GtkLabel" id="countdown_label">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label">00:00:00</property>
+            <property name="label">00∶00∶00</property>
             <attributes>
               <attribute name="font-features" value="tnum=1"/>
             </attributes>
@@ -124,9 +124,9 @@
                       </object>
                     </child>
                     <style>
+                      <class name="suggested-action"/>
                       <class name="round-button"/>
                       <class name="large-button"/>
-                      <class name="suggested-action"/>
                     </style>
                   </object>
                   <packing>
@@ -161,6 +161,7 @@
                     </child>
                     <style>
                       <class name="round-button"/>
+                      <class name="small-button"/>
                     </style>
                   </object>
                   <packing>
@@ -203,7 +204,7 @@
                     </child>
                     <style>
                       <class name="round-button"/>
-                      <class name="round-button"/>
+                      <class name="small-button"/>
                     </style>
                   </object>
                   <packing>
diff --git a/data/ui/timer_setup.ui b/data/ui/timer_setup.ui
index 213fb69..8c24dcb 100644
--- a/data/ui/timer_setup.ui
+++ b/data/ui/timer_setup.ui
@@ -213,7 +213,7 @@
                     <property name="can_focus">False</property>
                     <property name="halign">center</property>
                     <property name="valign">center</property>
-                    <property name="column_spacing">6</property>
+                    <property name="column_spacing">10</property>
                     <child>
                       <object class="GtkLabel">
                         <property name="visible">True</property>
diff --git a/src/timer.vala b/src/timer.vala
index a6c7839..06a4fbf 100644
--- a/src/timer.vala
+++ b/src/timer.vala
@@ -380,7 +380,7 @@ public class Row : Gtk.ListBoxRow {
     }
 
     private void update_countdown_label (int h, int m, int s) {
-        countdown_label.set_text ("%02i:%02i:%02i".printf (h, m, s));
+        countdown_label.set_text ("%02i ∶ %02i ∶ %02i".printf (h, m, s));
     }
 
     private void update_name_label () {


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