Skip to content
This repository has been archived by the owner on May 30, 2023. It is now read-only.

Commit

Permalink
Merge pull request #11 from ridaamirini/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
ridaamirini committed May 22, 2018
2 parents d5102d9 + f794e01 commit c5e57f1
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 7 deletions.
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "imapsyncclient",
"displayName": "ImapSync Client",
"productName": "ImapSync Client",
"version": "0.0.4",
"version": "0.0.5",
"author": "Rida Am. <rida-amirini@gmx.de>",
"description": "It's only an Internet Message Access Protocol Synchronization Client",
"license": "MIT",
Expand Down Expand Up @@ -77,6 +77,7 @@
},
"dependencies": {
"axios": "^0.16.1",
"electron-updater": "^2.21.4",
"element-ui": "^2.0.5",
"git-rev-sync": "^1.9.1",
"vue": "^2.3.3",
Expand Down
5 changes: 0 additions & 5 deletions src/main/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,6 @@ function createWindow () {
mainWindow.once('ready-to-show', () => {
mainWindow.show();
});

// @todo Disable Zoom in/out with mouse and pinch (Macbook trackpad)
/* let webFrame = require('electron').webFrame;
webFrame.setVisualZoomLevelLimits(1,1);
webFrame.setLayoutZoomLevelLimits(0, 0); */
}

// Single Instance
Expand Down
24 changes: 23 additions & 1 deletion src/renderer/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,36 @@
</script>

<style>
/* CSS */
body {
-ms-overflow-style: scrollbar;
-webkit-app-region: drag;
}
input[type="submit"],
input[type="reset"],
input[type="button"],
input[type="text"],
button,
textarea {
-webkit-app-region: no-drag;
}
.container {
-webkit-app-region: no-drag;
}
:not(input):not(textarea),
:not(input):not(textarea)::after,
:not(input):not(textarea)::before {
-webkit-user-select: none;
user-select: none;
cursor: default;
}
h1, h2, h3, h4, h5, h6 {
-webkit-user-select: none;
}
input, button, textarea, :focus {
outline: none;
}
Expand Down
5 changes: 5 additions & 0 deletions src/renderer/main.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import Vue from 'vue';
import { webFrame } from 'electron';
import axios from 'axios';
import ElementUI from 'element-ui';
import 'element-ui/lib/theme-chalk/index.css';
Expand All @@ -23,3 +24,7 @@ new Vue({
store,
template: '<App/>'
}).$mount('#app');

// WebFrame disable zoom in/out
webFrame.setVisualZoomLevelLimits(1, 1);
webFrame.setLayoutZoomLevelLimits(0, 0);

0 comments on commit c5e57f1

Please sign in to comment.