diff --git a/js/interface/settings.js b/js/interface/settings.js index bed01055..27b9298d 100644 --- a/js/interface/settings.js +++ b/js/interface/settings.js @@ -494,7 +494,6 @@ const Settings = { new Setting('nearest_rectangle_select',{category: 'snapping', value: false}); //Paint - new Setting('sync_color', {category: 'paint', value: false}); new Setting('color_wheel', {category: 'paint', value: false, onChange(value) { Interface.Panels.color.vue.picker_type = value ? 'wheel' : 'box'; }}); diff --git a/js/texturing/color.js b/js/texturing/color.js index 14ffbda7..1eb19b9a 100644 --- a/js/texturing/color.js +++ b/js/texturing/color.js @@ -428,9 +428,6 @@ Interface.definePanels(() => { ColorPanel.set = function(color, secondary, no_sync) { ColorPanel.change(color, secondary); ColorPanel.addToHistory(ColorPanel.vue.main_color) - if (!no_sync && isApp && settings.sync_color.value) { - ipcRenderer.send('change-main-color', ColorPanel.vue.main_color); - } } ColorPanel.get = function(secondary) { let color = secondary ? ColorPanel.vue.second_color : ColorPanel.vue.main_color; @@ -1176,7 +1173,7 @@ BARS.defineActions(function() { click: async function () { if (Blockbench.platform == 'win32') { // workaround for https://github.com/electron/electron/issues/27980 - ipcRenderer.send('request-color-picker', {sync: settings.sync_color.value}); + ipcRenderer.send('request-color-picker', {sync: false}); } else if (typeof EyeDropper == 'function') { let dropper = new EyeDropper(); diff --git a/lang/en.json b/lang/en.json index 3f08763b..c5b87787 100644 --- a/lang/en.json +++ b/lang/en.json @@ -945,8 +945,6 @@ "settings.nearest_rectangle_select": "Rectangle Selection: Nearest Edge", "settings.nearest_rectangle_select.desc": "Snap rectangle selections to the nearest pixel edge, like in GIMP, instead of entire pixels.", - "settings.sync_color": "Sync Color", - "settings.sync_color.desc": "Synchronize the color between different Blockbench instances", "settings.color_wheel": "Color Wheel", "settings.color_wheel.desc": "Use the color wheel as the main color picker", "settings.pick_color_opacity": "Pick Color Opacity", diff --git a/main.js b/main.js index 07976469..34f5eb9c 100644 --- a/main.js +++ b/main.js @@ -180,12 +180,6 @@ app.on('open-file', function (event, path) { } }) -ipcMain.on('change-main-color', (event, arg) => { - all_wins.forEach(win => { - if (win.isDestroyed() || win.webContents == event.sender.webContents) return; - win.webContents.send('set-main-color', arg) - }) -}) ipcMain.on('edit-launch-setting', (event, arg) => { LaunchSettings.set(arg.key, arg.value); })