Skip to content

Commit

Permalink
Merge commit 'a7c888ba100cde98244536e6772d2ce25153a811' into release
Browse files Browse the repository at this point in the history
  • Loading branch information
@davidjgraph
davidjgraph committed Jun 21, 2024
2 parents d47cf25 + a7c888b commit db0f661
Show file tree
Hide file tree
Showing 3 changed files with 93 additions and 27 deletions.
2 changes: 1 addition & 1 deletion drawio
Submodule drawio updated 445 files
82 changes: 71 additions & 11 deletions src/main/electron.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -231,27 +231,19 @@ function createWindow (opt = {})

mainWindow.on('maximize', function()
{
rememberWinSize(mainWindow);
mainWindow.webContents.send('maximize')
});

mainWindow.on('unmaximize', function()
{
rememberWinSize(mainWindow);
mainWindow.webContents.send('unmaximize')
});

mainWindow.on('resize', function()
{
rememberWinSize(mainWindow);
mainWindow.webContents.send('resize')
});

mainWindow.on('move', function()
{
rememberWinSize(mainWindow);
});

let uniqueIsModifiedId;

ipcMain.on('isModified-result', async (e, data) =>
Expand Down Expand Up @@ -318,6 +310,8 @@ function createWindow (opt = {})
contents.send('isModified', uniqueIsModifiedId);
event.preventDefault();
}

rememberWinSize(mainWindow);
})

// Emitted when the window is closed.
Expand Down Expand Up @@ -596,7 +590,6 @@ app.whenReady().then(() =>

try
{
console.log('Exporting ', paths);
inStat = fs.statSync(paths[0]);
}
catch(e)
Expand Down Expand Up @@ -980,13 +973,76 @@ app.whenReady().then(() =>
})
}
};


var zoomSteps = [0.25, 0.33, 0.5, 0.67, 0.75, 0.8, 0.9, 1,
1.1, 1.25, 1.5, 1.75, 2, 2.5, 3, 4, 5];

// Zooms to the next zoom step
function zoomInFn()
{
var zoomFactor = win.webContents.zoomFactor;
var newZoomFactor = zoomSteps[zoomSteps.length - 1];

for (var i = 0; i < zoomSteps.length; i++)
{
if (zoomSteps[i] - zoomFactor > 0.01)
{
newZoomFactor = zoomSteps[i];
break;
}
}

win.webContents.zoomFactor = newZoomFactor;
};

// Zooms to the previous zoom step
function zoomOutFn()
{
var zoomFactor = win.webContents.zoomFactor;
var newZoomFactor = zoomSteps[0];

for (var i = zoomSteps.length - 1; i >= 0; i--)
{
if (zoomSteps[i] - zoomFactor < -0.01)
{
newZoomFactor = zoomSteps[i];
break;
}
}

win.webContents.zoomFactor = newZoomFactor;
};

// Resets the zoom factor
function resetZoomFn()
{
win.webContents.zoomFactor = 1;
};

let checkForUpdates = {
label: 'Check for updates',
click: checkForUpdatesFn
}

let zoomIn = {
label: 'Zoom In',
click: zoomInFn
};

let zoomOut = {
label: 'Zoom Out',
click: zoomOutFn
};

let resetZoom = {
label: 'Actual Size',
click: resetZoomFn
};

ipcMain.on('checkForUpdates', checkForUpdatesFn);
ipcMain.on('zoomIn', zoomInFn);
ipcMain.on('zoomOut', zoomOutFn);
ipcMain.on('resetZoom', resetZoomFn);

if (isMac)
{
Expand All @@ -1002,11 +1058,15 @@ app.whenReady().then(() =>
click() { shell.openExternal('https://github.com/jgraph/drawio-desktop/issues'); }
},
checkForUpdates,
{ type: 'separator' },
resetZoom,
zoomIn,
zoomOut,
{ type: 'separator' },
{ role: 'hide' },
{ role: 'hideothers' },
{ role: 'unhide' },
{ type: 'separator' },
{ type: 'separator' },
{ role: 'quit' }
]
}, {
Expand Down
36 changes: 21 additions & 15 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -198,9 +198,9 @@
integrity sha512-nG96G3Wp6acyAgJqGasjODb+acrI7KltPiRxzHPXnP3NgI28bpQDRv53olbqGXbfcgF5aiiHmO3xpwEpS5Ld9g==

"@types/node@*", "@types/node@^20.9.0":
version "20.14.2"
resolved "https://registry.yarnpkg.com/@types/node/-/node-20.14.2.tgz#a5f4d2bcb4b6a87bffcaa717718c5a0f208f4a18"
integrity sha512-xyu6WAMVwv6AKFLB+e/7ySZVr/0zLCzOa7rSpq6jNwpqOrUbcACDWC+53d4n2QHOnDou0fbIsg8wZu/sxrnI4Q==
version "20.14.7"
resolved "https://registry.yarnpkg.com/@types/node/-/node-20.14.7.tgz#342cada27f97509eb8eb2dbc003edf21ce8ab5a8"
integrity sha512-uTr2m2IbJJucF3KUxgnGOZvYbN0QgkGyWxG6973HCpMYFy2KfcgYuIwkJQMQkt1VbBMlvWRbpshFTLxnxCZjKQ==
dependencies:
undici-types "~5.26.4"

Expand Down Expand Up @@ -1029,9 +1029,9 @@ filelist@^1.0.4:
minimatch "^5.0.1"

foreground-child@^3.1.0:
version "3.1.1"
resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-3.1.1.tgz#1d173e776d75d2772fed08efe4a0de1ea1b12d0d"
integrity sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==
version "3.2.1"
resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-3.2.1.tgz#767004ccf3a5b30df39bed90718bab43fe0a59f7"
integrity sha512-PXUUyLqrR2XCWICfv6ukppP96sdFwWbNEnfEMt7jNsISjMsvaLNinAHNDYyvkyU+SZG2BTSbT5NjG+vZslfGTA==
dependencies:
cross-spawn "^7.0.0"
signal-exit "^4.0.1"
Expand Down Expand Up @@ -1119,14 +1119,15 @@ get-stream@^5.1.0:
pump "^3.0.0"

glob@^10.3.10:
version "10.4.1"
resolved "https://registry.yarnpkg.com/glob/-/glob-10.4.1.tgz#0cfb01ab6a6b438177bfe6a58e2576f6efe909c2"
integrity sha512-2jelhlq3E4ho74ZyVLN03oKdAZVUa6UDZzFLVH1H7dnoax+y9qyaq8zBkfDIggjniU19z0wU18y16jMB2eyVIw==
version "10.4.2"
resolved "https://registry.yarnpkg.com/glob/-/glob-10.4.2.tgz#bed6b95dade5c1f80b4434daced233aee76160e5"
integrity sha512-GwMlUF6PkPo3Gk21UxkCohOv0PLcIXVtKyLlpEI28R/cO/4eNOdmLk3CMW1wROV/WR/EsZOWAfBbBOqYvs88/w==
dependencies:
foreground-child "^3.1.0"
jackspeak "^3.1.2"
minimatch "^9.0.4"
minipass "^7.1.2"
package-json-from-dist "^1.0.0"
path-scurry "^1.11.1"

glob@^7.1.6:
Expand Down Expand Up @@ -1584,6 +1585,11 @@ p-cancelable@^2.0.0:
resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-2.1.1.tgz#aab7fbd416582fa32a3db49859c122487c5ed2cf"
integrity sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==

package-json-from-dist@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/package-json-from-dist/-/package-json-from-dist-1.0.0.tgz#e501cd3094b278495eb4258d4c9f6d5ac3019f00"
integrity sha512-dATvCeZN/8wQsGywez1mzHtTlP22H8OEfPrVMLNr4/eGa+ijtLn/6M5f0dY8UKNrC2O9UCU6SSoG3qRKnt7STw==

pako@^1.0.10, pako@^1.0.11, pako@^1.0.6:
version "1.0.11"
resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz#6c9599d340d54dfd3946380252a35705a6b992bf"
Expand Down Expand Up @@ -1988,14 +1994,14 @@ type-fest@^3.8.0:
integrity sha512-tLq3bSNx+xSpwvAJnzrK0Ep5CLNWjvFTOp71URMaAEWBfRb9nnJiBoUe0tF8bI4ZFO3omgBR6NvnbzVUT3Ly4g==

type-fest@^4.18.1:
version "4.20.0"
resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-4.20.0.tgz#019becf5a97cd58eee93f592f0961859a74482a7"
integrity sha512-MBh+PHUHHisjXf4tlx0CFWoMdjx8zCMLJHOjnV1prABYZFHqtFOyauCIK2/7w4oIfwkF8iNhLtnJEfVY2vn3iw==
version "4.20.1"
resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-4.20.1.tgz#d97bb1e923bf524e5b4b43421d586760fb2ee8be"
integrity sha512-R6wDsVsoS9xYOpy8vgeBlqpdOyzJ12HNfQhC/aAKWM3YoCV9TtunJzh/QpkMgeDhkoynDcw5f1y+qF9yc/HHyg==

typescript@^5.3.3:
version "5.4.5"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.4.5.tgz#42ccef2c571fdbd0f6718b1d1f5e6e5ef006f611"
integrity sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==
version "5.5.2"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.5.2.tgz#c26f023cb0054e657ce04f72583ea2d85f8d0507"
integrity sha512-NcRtPEOsPFFWjobJEtfihkLCZCXZt/os3zf8nTxjVH3RvTSxjrCamJpbExGvYOF+tFHc3pA65qpdwPbzjohhew==

uint8array-extras@^0.3.0:
version "0.3.0"
Expand Down

0 comments on commit db0f661

Please sign in to comment.