mirror/blockbench
2
0
Fork 0
mirror of https://github.com/JannisX11/blockbench.git synced 2025-04-06 17:31:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Limit zoom level when opening pixel art

Browse Source 
Update electron to 25.2
This commit is contained in:
JannisX11 2023-06-30 19:57:10 +02:00
parent 65757d2a2d
commit c9fb63d1cb
4 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
js/io/formats/image.js
View File

@ -58,6 +58,9 @@ let codec = new Codec('image', {
Project.texture_height = last.display_height;
Project.texture_width = last.width;
}
let pixel_size_limit = Math.min(32 / UVEditor.getPixelSize(), 1);
if (pixel_size_limit < 1) UVEditor.setZoom(pixel_size_limit)
if (isApp) updateRecentProjectThumbnail();
}
}

7
js/texturing/uv.js
View File

@ -2041,13 +2041,6 @@ Interface.definePanels(function() {
}
},
watch: {
project_resolution: {
deep: true,
handler() {
let min_zoom = Math.min(1, this.inner_width/this.inner_height);
if (this.zoom < min_zoom) UVEditor.setZoom(1);
}
},
mode() {
Vue.nextTick(() => {
this.updateSize();

26
package-lock.json generated
View File

@ -1,6 +1,6 @@
{
"name": "Blockbench",
"version": "4.7.1",
"version": "4.8.0",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
@ -2410,9 +2410,9 @@
"dev": true
},
"cacheable-request": {
"version": "7.0.2",
"resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.2.tgz",
"integrity": "sha512-pouW8/FmiPQbuGpkXQ9BAPv/Mo5xDGANgSNXzTzJ8DrKGuXOssM4wIQRjfanNRh3Yu5cfYPvcorqbhg2KIJtew==",
"version": "7.0.4",
"resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.4.tgz",
"integrity": "sha512-v+p6ongsrp0yTGbJXjgxPow2+DL93DASP4kXCDKb8/bwRtt9OEF3whggkkDkGNzgcWy2XaF4a8nZglC7uElscg==",
"dev": true,
"requires": {
"clone-response": "^1.0.2",
@ -2823,9 +2823,9 @@
}
},
"electron": {
"version": "24.1.1",
"resolved": "https://registry.npmjs.org/electron/-/electron-24.1.1.tgz",
"integrity": "sha512-ymjUMe6Pvh9ytpM4lOvr+Qxd6NG5AELRtR6tw54bK3FXfKtTTKKAtZw/NbwHwkRAlWu8FNAGOuvCoap6/bm9LQ==",
"version": "25.2.0",
"resolved": "https://registry.npmjs.org/electron/-/electron-25.2.0.tgz",
"integrity": "sha512-I/rhcW2sV2fyiveVSBr2N7v5ZiCtdGY0UiNCDZgk2fpSC+irQjbeh7JT2b4vWmJ2ogOXBjqesrN9XszTIG6DHg==",
"dev": true,
"requires": {
"@electron/get": "^2.0.0",
@ -2834,9 +2834,9 @@
},
"dependencies": {
"@types/node": {
"version": "18.15.11",
"resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.11.tgz",
"integrity": "sha512-E5Kwq2n4SbMzQOn6wnmBjuK9ouqlURrcZDVfbo9ftDDTFt3nk7ZKK4GMOzoYgnpQJKcxwQw+lGaBvvlMo0qN/Q==",
"version": "18.16.18",
"resolved": "https://registry.npmjs.org/@types/node/-/node-18.16.18.tgz",
"integrity": "sha512-/aNaQZD0+iSBAGnvvN2Cx92HqE5sZCPZtx2TsK+4nvV23fFe09jVDvpArXr2j9DnYlzuU9WuoykDDc6wqvpNcw==",
"dev": true
}
}
@ -3542,9 +3542,9 @@
},
"dependencies": {
"semver": {
"version": "7.4.0",
"resolved": "https://registry.npmjs.org/semver/-/semver-7.4.0.tgz",
"integrity": "sha512-RgOxM8Mw+7Zus0+zcLEUn8+JfoLpj/huFTItQy2hsM4khuC1HYRDp0cU482Ewn/Fcy6bCjufD8vAj7voC66KQw==",
"version": "7.5.3",
"resolved": "https://registry.npmjs.org/semver/-/semver-7.5.3.tgz",
"integrity": "sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ==",
"dev": true,
"optional": true,
"requires": {

2
package.json
View File

@ -106,7 +106,7 @@
},
"devDependencies": {
"blockbench-types": "^4.6.1",
"electron": "^24.1.1",
"electron": "^25.2.0",
"electron-builder": "^23.6.0",
"electron-notarize": "^1.0.0",
"webpack": "^5.74.0",