mirror/blockbench
2
0
Fork 0
mirror of https://github.com/JannisX11/blockbench.git synced 2024-11-21 01:13:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove Sync Color feature, as tabs exist now

Browse Source
This commit is contained in:
JannisX11 2023-11-10 17:43:08 +01:00
parent f8cf425d62
commit 8002f335f4
4 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
js/interface/settings.js
View File

@ -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';
}});

5
js/texturing/color.js
View File

@ -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();

2
lang/en.json
View File

@ -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",

6
main.js
View File

@ -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);
})