Skip to content
Permalink
Browse files

Bugfix Settings page Edit mode button (#754)

* full displays overlay (#730) (#747)

* path error fix

also some comment

* bugfix overlay settings page

* correct version number in package-lock
  • Loading branch information
lusbenjamin authored and Manuel-777 committed Nov 24, 2019
1 parent 812ed49 commit 2c86f8618f624d641353bfcd8fe054e059033ba7
Showing with 8 additions and 31 deletions.
  1. +1 −1 package-lock.json
  2. +6 −1 src/main.js
  3. +1 −29 src/window_main/settings.js

Some generated files are not rendered by default. Learn more.

@@ -77,7 +77,12 @@ app.on("ready", () => {
require("devtron").install();
const dotenv = require("dotenv");
dotenv.config();
electron.BrowserWindow.addDevToolsExtension(process.env.REACTDEVTOOLSEXT);
if (process.env.REACTDEVTOOLSEXT) {
// To enable REACT dev tools createa an .env file
// and add REACTDEVTOOLSEXT="path"
// where path is the path to your chrome extension folder
electron.BrowserWindow.addDevToolsExtension(process.env.REACTDEVTOOLSEXT);
}
}
});

@@ -492,7 +492,6 @@ function appendDataSection(section) {
function appendOverlay(section) {
section.appendChild(createDiv(["settings_title"], "Overlays"));

const displayControls = createDiv(["settings_row"]);
// Toggle Edit Mode Button
const editModeButton = createDiv(
["button_simple"],
@@ -502,34 +501,7 @@ function appendOverlay(section) {
editModeButton.addEventListener("click", function() {
ipcSend("toggle_edit_mode");
});
displayControls.appendChild(editModeButton);
/*
// Set Overlay Display Screen
const overlayDisplay = pd.settings.overlay_display
? pd.settings.overlay_display
: remote.screen.getPrimaryDisplay().id;
const label = createLabel(["but_container_label"], "Overlay Display:");
label.style.marginTop = "auto";
const displaySelect = createSelect(
label,
remote.screen.getAllDisplays().map(display => display.id),
overlayDisplay,
filter => ipcSend("save_user_settings", { overlay_display: filter }),
"overlay_display",
filter => {
const displayNumber = remote.screen
.getAllDisplays()
.findIndex(d => d.id == filter);
const primary = filter == remote.screen.getPrimaryDisplay().id;
return `Display ${displayNumber} ${primary ? "(primary)" : ""}`;
}
);
displaySelect.style.width = "180px";
displaySelect.style.marginLeft = "32px";
displayControls.appendChild(label);
*/
section.appendChild(displayControls);
section.appendChild(editModeButton);

// Copy pasta with bolognesa!
const pickerLabel = createLabel(

0 comments on commit 2c86f86

Please sign in to comment.
You can’t perform that action at this time.