electron-screenshots 0.5.2 → 0.5.5

package/lib/index.js

@@ -10,13 +10,7 @@ electron_1.app.whenReady().then(function () {
         lang: {
             operation_rectangle_title: '矩形2323'
         },
-        logger: function () {
-            var args = [];
-            for (var _i = 0; _i < arguments.length; _i++) {
-                args[_i] = arguments[_i];
-            }
-            return console.log(args);
-        },
+        // logger: (...args: unknown[]) => console.log(args),
         singleWindow: true
     });
     screenshots.$view.webContents.openDevTools();
@@ -43,6 +37,12 @@ electron_1.app.whenReady().then(function () {
     screenshots.on('save', function (e, buffer, bounds) {
         console.log('capture', buffer, bounds);
     });
+    var mainWin = new electron_1.BrowserWindow({
+        fullscreen: true,
+        show: true
+    });
+    mainWin.removeMenu();
+    mainWin.loadURL('https://github.com/nashaofu');
 });
 electron_1.app.on('window-all-closed', function () {
     if (process.platform !== 'darwin') {

package/lib/screenshots.js

@@ -127,11 +127,6 @@ var Screenshots = /** @class */ (function (_super) {
                     case 2:
                         _a.sent();
                         this.$view.webContents.send('SCREENSHOTS:capture', display, imageUrl);
-                        if (!this.$win) {
-                            return [2 /*return*/];
-                        }
-                        this.$win.blur();
-                        this.$win.show();
                         return [2 /*return*/];
                 }
             });
@@ -157,10 +152,9 @@ var Screenshots = /** @class */ (function (_super) {
                         this.$win.setFullScreen(false);
                         this.$win.setSimpleFullScreen(false);
                         this.$win.blur();
-                        this.$win.setBrowserView(null);
-                        // 必须设置为 closable 为 true
-                        // 否者不能关闭窗口
-                        this.$win.setClosable(true);
+                        this.$win.blurWebView();
+                        this.$win.unmaximize();
+                        this.$win.removeBrowserView(this.$view);
                         if (this.singleWindow) {
                             this.$win.hide();
                         }
@@ -241,11 +235,9 @@ var Screenshots = /** @class */ (function (_super) {
                                 show: false,
                                 autoHideMenuBar: true,
                                 transparent: true,
-                                resizable: false,
+                                // resizable 设置为 false 会导致页面崩溃
+                                // resizable: false,
                                 movable: false,
-                                closable: false,
-                                minimizable: false,
-                                maximizable: false,
                                 // focusable: true, 否则窗口不能及时响应esc按键，输入框也不能输入
                                 focusable: true,
                                 // linux 下必须设置为false，否则不能全屏显示在最上层
@@ -270,10 +262,21 @@ var Screenshots = /** @class */ (function (_super) {
                                 (_b = _this.$win) === null || _b === void 0 ? void 0 : _b.setKiosk(true);
                             });
                         }
-                        this.$win.setFullScreen(process.platform === 'darwin');
-                        // 设置为 false，mac 就不显示左上角关闭按钮
-                        this.$win.setClosable(false);
                         this.$win.setBrowserView(this.$view);
+                        // 适定平台
+                        if (process.platform === 'darwin') {
+                            this.$win.setWindowButtonVisibility(false);
+                        }
+                        if (process.platform !== 'win32') {
+                            this.$win.setVisibleOnAllWorkspaces(true, {
+                                visibleOnFullScreen: true,
+                                skipTransformProcessType: true
+                            });
+                        }
+                        this.$win.blur();
+                        this.$win.setKiosk(false);
+                        this.$win.setFullScreen(process.platform === 'darwin');
+                        this.$win.setSimpleFullScreen(process.platform === 'darwin');
                         this.$win.setBounds(display);
                         this.$view.setBounds({
                             x: 0,
@@ -281,6 +284,7 @@ var Screenshots = /** @class */ (function (_super) {
                             width: display.width,
                             height: display.height
                         });
+                        this.$win.show();
                         return [2 /*return*/];
                 }
             });
@@ -396,7 +400,6 @@ var Screenshots = /** @class */ (function (_super) {
                         milliseconds = (0, padStart_1.default)(time.getMilliseconds(), 3, '0');
                         this.$win.setAlwaysOnTop(false);
                         return [4 /*yield*/, electron_1.dialog.showSaveDialog(this.$win, {
-                                title: '保存图片',
                                 defaultPath: "".concat(year).concat(month).concat(date).concat(hours).concat(minutes).concat(seconds).concat(milliseconds, ".png")
                             })];
                     case 1:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "electron-screenshots",
-  "version": "0.5.2",
+  "version": "0.5.5",
   "description": "electron 截图插件",
   "types": "lib/screenshots.d.ts",
   "main": "lib/screenshots.js",
@@ -37,7 +37,7 @@
   "dependencies": {
     "debug": "^4.3.3",
     "fs-extra": "^10.1.0",
-    "node-screenshots": "^0.0.3",
+    "node-screenshots": "^0.0.6",
     "react-screenshots": "^0.5.1"
   },
   "peerDependencies": {
@@ -58,5 +58,5 @@
     "rimraf": "^3.0.2",
     "typescript": "^4.5.5"
   },
-  "gitHead": "8cfc003a0b5159255cea5e2990515fc824982b1e"
+  "gitHead": "33effdd2bb39a34303895c70428f3589b15582eb"
 }