Fix: Disable pinch to zoom

Rokt33r · Rokt33r · commit 920704075e68 · 2015-07-30T04:11:31.000+09:00
diff --git a/browser/finder/index.electron.html b/browser/finder/index.electron.html
@@ -1,11 +1,20 @@
 <!DOCTYPE html>
 <html>
 <head>
+
   <title>CodeXen Popup</title>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0"/>
 
   <link rel="stylesheet" href="../../node_modules/font-awesome/css/font-awesome.min.css" media="screen" title="no title" charset="utf-8">
   <link rel="shortcut icon" href="favicon.ico">
   <script>
+  document.addEventListener('mousewheel', function(e) {
+    if(e.deltaY % 1 !== 0) {
+      e.preventDefault()
+    }
+  })
+
   if (!Object.assign) {
     Object.defineProperty(Object, 'assign', {
       enumerable: false,
diff --git a/browser/main/index.electron.html b/browser/main/index.electron.html
@@ -2,11 +2,19 @@
 <html>
 <head>
   <title>CodeXen</title>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0"/>
 
   <link rel="stylesheet" href="../../node_modules/font-awesome/css/font-awesome.min.css" media="screen" title="no title" charset="utf-8">
   <link rel="shortcut icon" href="favicon.ico">
 
   <script>
+  document.addEventListener('mousewheel', function(e) {
+    if(e.deltaY % 1 !== 0) {
+      e.preventDefault()
+    }
+  })
+
   if (!Object.assign) {
     Object.defineProperty(Object, 'assign', {
       enumerable: false,
diff --git a/browser/styles/main/containers/LoginContainer.styl b/browser/styles/main/containers/LoginContainer.styl
@@ -59,7 +59,6 @@
       margin-bottom 15px
       height 44px
       text-align center
-      border-radius 22px
     .alertInfo
       alertInfo()
     .alertError
diff --git a/browser/styles/shared/modal.styl b/browser/styles/shared/modal.styl
@@ -8,7 +8,7 @@
   &.hide
     display none
   .modal
-    width 500px
+    width 600px
     margin 50px auto 0
     absolute top left right
     background-color white
diff --git a/main.js b/main.js
@@ -23,7 +23,7 @@ app.on('ready', function () {
   Menu.setApplicationMenu(menu)
   // menu end
   appIcon = new Tray(__dirname + '/tray-icon.png')
-  appIcon.setToolTip('This is my application.')
+  appIcon.setToolTip('Codexen')
   appIcon.on('clicked', function () {
     if (mainWindow == null) {
       makeNewMainWindow()
@@ -46,6 +46,7 @@ app.on('ready', function () {
     height: 400,
     show: false,
     frame: false,
+    'zoom-factor': 1.0,
     'always-on-top': true,
     'web-preferences': {
         'overlay-scrollbars': true,
@@ -82,6 +83,7 @@ function makeNewMainWindow () {
   mainWindow = new BrowserWindow({
     width: 1080,
     height: 720,
+    'zoom-factor': 1.0,
     'web-preferences': {
         'overlay-scrollbars': true
       }
