Commit 2f3d45f1 authored by Tristan A Spakes's avatar Tristan A Spakes

Reenabled dev tool filter. Attempting to fix resizing issue by enabling,...

Reenabled dev tool filter. Attempting to fix resizing issue by enabling, resizing, and then disabling the resize function
parent bb68070f
Pipeline #23030 passed with stages
in 1 minute and 4 seconds
...@@ -258,7 +258,7 @@ function createWindow() { ...@@ -258,7 +258,7 @@ function createWindow() {
var menu = Menu.buildFromTemplate(menuTemplate); var menu = Menu.buildFromTemplate(menuTemplate);
Menu.setApplicationMenu(menu); //Sets the template as the app menu Menu.setApplicationMenu(menu); //Sets the template as the app menu
mainWindow.openDevTools() //Opens dev tools on start //mainWindow.openDevTools() //Opens dev tools on start
} }
function addWin(file, title, width, height) { function addWin(file, title, width, height) {
...@@ -281,12 +281,14 @@ function addWin(file, title, width, height) { ...@@ -281,12 +281,14 @@ function addWin(file, title, width, height) {
height: height, height: height,
x: x, x: x,
y: y, y: y,
//resizable: false, resizable: false,
resizable: true,
alwaysOnTop: true alwaysOnTop: true
}) })
} else { } else {
//Allow resizing when the window content is changing
addWindow.setResizable(true)
addWindow.setSize(width, height) addWindow.setSize(width, height)
addWindow.setResizable(false)
} }
addWindow.loadFile(file) addWindow.loadFile(file)
...@@ -307,7 +309,7 @@ function addWin(file, title, width, height) { ...@@ -307,7 +309,7 @@ function addWin(file, title, width, height) {
}) })
addWindow.setMenu(null) addWindow.setMenu(null)
addWindow.openDevTools() //addWindow.openDevTools()
} }
} }
......
#! /bin/bash #! /bin/bash
#DEV_TOOLS_CHECK_MAIN="$(grep 'mainWindow.openDevTools()' main.js)" DEV_TOOLS_CHECK_MAIN="$(grep 'mainWindow.openDevTools()' main.js)"
#DEV_TOOLS_CHECK_ADD="$(grep 'addWindow.openDevTools()' main.js)" DEV_TOOLS_CHECK_ADD="$(grep 'addWindow.openDevTools()' main.js)"
#if [[ "${DEV_TOOLS_CHECK_MAIN}" ]]; then if [[ "${DEV_TOOLS_CHECK_MAIN}" ]]; then
# if [[ ! $(echo "${DEV_TOOLS_CHECK_MAIN}" | grep -o '//mainWindow.openDevTools()') ]]; then if [[ ! $(echo "${DEV_TOOLS_CHECK_MAIN}" | grep -o '//mainWindow.openDevTools()') ]]; then
#exit 1 exit 1
# fi fi
# if [[ ! $(echo "${DEV_TOOLS_CHECK_ADD}" | grep -o '//addWindow.openDevTools()') ]]; then if [[ ! $(echo "${DEV_TOOLS_CHECK_ADD}" | grep -o '//addWindow.openDevTools()') ]]; then
#exit 1 exit 1
# fi fi
#fi fi
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment