Merge pull request #90 from tahnik/fix_notif_bugs

Fix notif bugs
tahnik · Jul 21, 2017 · d265d3e · d265d3e
2 parents 414dae7 + a1d1d3c
commit d265d3e
Show file tree

Hide file tree

Showing 5 changed files with 648 additions and 4,485 deletions.
diff --git a/app/src/main/app.js b/app/src/main/app.js
@@ -1,12 +1,11 @@
 const electron = require('electron');
 
-const { app, BrowserWindow, Menu, Tray } = electron;
+const { app, BrowserWindow, Menu, Tray, ipcMain } = electron;
 
 const https = require('https');
 const os = require('os');
 const path = require('path');
 const url = require('url');
-const { ipcMain } = require('electron');
 const { autoUpdater } = require('electron-updater');
 
 const notify = require(path.join(__dirname, '/modules/notify.js'));
@@ -74,6 +73,23 @@ function initTray() {
 function createWindow() {
   notify.init();
 
+  // Some shortcuts to make development easier.
+  if (process.env.NODE_ENV === 'development') {
+    const { globalShortcut } = electron;
+
+    const showNotifGlobal = globalShortcut.register('CommandOrControl+Alt+N', () => {
+      notify.show({
+        body: 'This is a test notification.',
+        content: { comment_id: 728393, created_time: 1500665102, rant_id: 538347, read: 0, type: 'comment_mention', uid: 719925 },
+        id: 538347,
+      });
+    });
+
+    if (!showNotifGlobal) {
+      console.warn('registration failed :(');
+    }
+  }
+
   // Send usage data to firebase
   if (process.env.NODE_ENV !== 'development') {
     let plat = '';

diff --git a/app/src/main/modules/notification.html b/app/src/main/modules/notification.html
@@ -244,7 +244,7 @@ <h4 id="header">USER</h4>
       }
 
       function calcPos() {
-        main.ui().setSize(460, document.getElementById('app').scrollHeight - 13);
+        main.ui().setSize(444, document.getElementById('app').scrollHeight - 13);
         setTimeout(()=>{
           var np = screen.getDisplayNearestPoint(screen.getCursorScreenPoint());
           var ap = screen.getCursorScreenPoint();
@@ -261,7 +261,7 @@ <h4 id="header">USER</h4>
               np.workArea.y + 12
             )
           }
-        }, 65)
+        }, 100)
       }
 
       window.onbeforeunload = (e) => {

diff --git a/app/src/main/modules/notify.js b/app/src/main/modules/notify.js
@@ -26,7 +26,7 @@ function notifyLinux(opt) {
 let w;
 function initUI() {
   w = new BrowserWindow({
-    width: 460,
+    width: 444,
     height: 172,
     frame: false,
     show: false,