macos bug fixed

RoderickQiu · Nov 10, 2019 · 0a553e4 · 0a553e4
1 parent 68b1db2
commit 0a553e4
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wnr",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "description": "It's a timer app with strong expansibility for computers. The name is an abbr of \"Work and Rest\".",
   "main": "main.js",
   "scripts": {

diff --git a/style.css b/style.css
@@ -229,17 +229,16 @@ li {
     width: 90%;
 }
 
-#controller, #time-bar {
+#controller, #time-bar, #time-bar-macos {
     position: absolute;
     top: 5px;
-    right: 8px;
     font-size: 18px;
     -webkit-app-region: no-drag;
     /* let it clickable */
     -webkit-user-select: none;
 }
 
-#controller {
+#controller, #time-bar-macos {
     right: 8px;
 }
 

diff --git a/timer.html b/timer.html
@@ -24,9 +24,8 @@
 <body>
     <script src="supporter.js"></script>
     <div class="d-flex mx-auto justify-content-center align-items-center text-dark" id="main">
-        <div id="time-bar" class="text-muted">
-            00:00
-        </div>
+        <div id="time-bar" class="text-muted"></div>
+        <div id="time-bar-macos" class="text-muted"></div><!-- time-bar for systems -->
         <div id="controller">
             <a href="javascript:call('winhider')" class="small work" id="win-hider"><i class="fa fa-sort-desc fa-fw"
                     id="winhider"></i></a><span id="no-use-space">&nbsp;&nbsp;</span>
@@ -232,7 +231,8 @@
                     seconds = seconds - hours * 3600 - minutes * 60;
                     $("#now-timing").text(hours + h + minutes + min + seconds + s);
                     timeget = fnW(dt.getHours()) + ":" + fnW(dt.getMinutes());
-                    $("#time-bar").html(timeget);//显示时间
+                    if (process.platform != "darwin") $("#time-bar").html(timeget);
+                    else $("#time-bar-macos").html(timeget);//显示时间
                     if (minutes == 0 && morethan1 && hours == 0) {
                         if (store.get("onemintip") != false) ipc.send("1min");
                         morethan1 = 0;