poprawki na ubuntu

kartofelek007 · Apr 8, 2020 · 4a35bc9 · 4a35bc9
1 parent 85f51f2
commit 4a35bc9
Show file tree

Hide file tree

Showing 7 changed files with 171 additions and 83 deletions.
diff --git a/css/pick-color.css b/css/pick-color.css
@@ -9,4 +9,33 @@ body {
 }
 #optCanvas {
     pointer-events: none;
+}
+
+.color-picker-close {
+    display: none;
+    z-index: 2;
+    position: absolute;
+    right: 0;
+    top: 0;
+    width: 70px;
+    height: 70px;
+    background: #222;
+    border:0;
+    cursor: pointer;
+    outline: none;
+}
+.color-picker-close::before,
+.color-picker-close::after {
+    content: "";
+
+    width: 30px;
+    height: 3px;
+    background: #fff;
+    position: absolute;
+    left: 50%;
+    top: 50%;
+    transform: translate(-50%, -50%) rotate(45deg);
+}
+.color-picker-close::after {
+    transform: translate(-50%, -50%) rotate(-45deg);
 }
diff --git a/js/palette.js b/js/palette.js
@@ -9,7 +9,7 @@ export const paletteElement = document.querySelector("#palette");
 
 export const attachNewColor = function(color) {
     const element = createPaletteElement(color);
-    paletteElement.append(element);
+    paletteElement.prepend(element);
 }
 
 export const createPaletteElement = function(color) {
@@ -95,7 +95,6 @@ const drag = new DragDrop('#palette', {
         const elements = paletteElement.querySelectorAll(".palette-element");
         const palette = [...elements].map(el => el.dataset.color);
         saveColorsToFile(palette);
-        saveColorsToFile(palette);
     },
     className : "palette-element"
 });

diff --git a/main.js b/main.js
@@ -15,29 +15,23 @@ const myApp = {
     mainWindow: null,
     contextMenu: false,
     pickedWindow: null,
-    windowOpen: false,
     menu: null,
     tray: null, //musi byc globalne bo inaczej garbage collector sprawia ze nie mia ikonki w trayu
 
-    toggleMainWindow() {
-
-        if (this.windowOpen) {
-            this.windowOpen = false;
+    toggleMainWindow(show) {
+        if (!show) {
             this.mainWindow.hide();
-            console.log(this.windowOpen);
         } else {
-            this.windowOpen = true;
             this.mainWindow.show();
             this.mainWindow.restore();
-            console.log(this.windowOpen);
         }
     },
 
     createMainWindow() {
         const { width: screenW, height: screenH } = screen.getPrimaryDisplay().workAreaSize;
 
         this.mainWindow = new BrowserWindow({
-            icon: path.join(__dirname, '/images/icon.ico'),
+            icon: path.join(__dirname, '/images/icon.png'),
             width: 360,
             height: screenH,
             x: screenW - 360,
@@ -53,19 +47,19 @@ const myApp = {
 
         this.mainWindow.loadFile('index.html');
 
-        this.mainWindow.hide();
+        //this.mainWindow.hide();
 
         this.mainWindow.on('minimize', e => {
             e.preventDefault();
             this.mainWindow.hide();
         });
 
-        const imgPath = path.join(__dirname, '/images/icon.ico');
+        const imgPath = path.join(__dirname, '/images/icon.png');
 
         this.tray = new Tray(imgPath);
         this.tray.setToolTip('kolory');
         this.tray.on('click', () => {
-            this.toggleMainWindow();
+            this.toggleMainWindow(true);
         });
 
         Menu.setApplicationMenu(null);
@@ -96,9 +90,15 @@ const myApp = {
     },
 
     createColorPickWindow() {
+        const { width: screenW, height: screenH } = screen.getPrimaryDisplay().workAreaSize;
+
         this.pickedWindow = new BrowserWindow({
-            icon: path.join(__dirname, './images/icon.ico'),
+            icon: path.join(__dirname, './images/icon.png'),
             fullscreen: true,
+            // x: 0,
+            // y : 0,
+            // width: screenW,
+            // height: screenH,
             alwaysOnTop: true,
             movable: false,
             minimizable: false,
@@ -112,16 +112,24 @@ const myApp = {
             }
         });
 
+        //this.pickedWindow.webContents.openDevTools()
+
         this.pickedWindow.loadFile('pick-color.html');
         this.pickedWindow.once('ready-to-show', () => {
             this.pickedWindow.show();
         });
-        //pickedWindow.webContents.openDevTools()
+        //this.pickedWindow.webContents.openDevTools()
     },
 
     bindCommunication() {
         ipcMain.on('createColorPickWindow', (event, file, content) => {
             this.createColorPickWindow();
+            this.mainWindow.hide();
+        });
+
+        ipcMain.on('closeColorPickWindow', (event, file, content) => {
+            this.pickedWindow.close();
+            this.toggleMainWindow(true);
         });
 
         ipcMain.on('colorPicked', (event, messages) => {
@@ -130,6 +138,9 @@ const myApp = {
     },
 
     init() {
+        app.commandLine.appendSwitch('disable-transparent-visuals');
+        app.commandLine.appendSwitch('disable-gpu');
+
         app.on('ready', () => {
             this.createMainWindow();
             this.createContextMenu();

diff --git a/package-lock.json b/package-lock.json
diff --git a/pick-color.html b/pick-color.html
@@ -7,6 +7,7 @@
     <link rel="stylesheet" href="css/pick-color.css">
 </head>
 <body>
+    <button class="color-picker-close"></button>
     <canvas id="mainCanvas"></canvas>
     <canvas id="optCanvas"></canvas>
     <script src="renderer-pick-color.js" type="module"></script>