electron-screenshots 0.5.15 → 0.5.17

package/lib/getDisplay.d.ts

@@ -1,6 +1,7 @@
 import { Rectangle } from 'electron';
 export interface Display extends Rectangle {
     id: number;
+    scaleFactor: number;
 }
 declare const _default: () => Display;
 export default _default;

package/lib/getDisplay.js

@@ -3,13 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var electron_1 = require("electron");
 exports.default = (function () {
     var point = electron_1.screen.getCursorScreenPoint();
-    var _a = electron_1.screen.getDisplayNearestPoint(point), id = _a.id, bounds = _a.bounds;
+    var _a = electron_1.screen.getDisplayNearestPoint(point), id = _a.id, bounds = _a.bounds, scaleFactor = _a.scaleFactor;
     // https://github.com/nashaofu/screenshots/issues/98
     return {
         id: id,
         x: Math.floor(bounds.x),
         y: Math.floor(bounds.y),
         width: Math.floor(bounds.width),
-        height: Math.floor(bounds.height)
+        height: Math.floor(bounds.height),
+        scaleFactor: scaleFactor
     };
 });

package/lib/screenshots.js

@@ -294,6 +294,7 @@ var Screenshots = /** @class */ (function (_super) {
                             width: display.width,
                             height: display.height
                         });
+                        this.$win.setAlwaysOnTop(true);
                         this.$win.show();
                         return [2 /*return*/];
                 }
@@ -340,8 +341,8 @@ var Screenshots = /** @class */ (function (_super) {
                         return [4 /*yield*/, electron_1.desktopCapturer.getSources({
                                 types: ['screen'],
                                 thumbnailSize: {
-                                    width: display.width,
-                                    height: display.height
+                                    width: display.width * display.scaleFactor,
+                                    height: display.height * display.scaleFactor
                                 }
                             })];
                     case 5:
@@ -377,7 +378,7 @@ var Screenshots = /** @class */ (function (_super) {
          * OK事件
          */
         electron_1.ipcMain.on('SCREENSHOTS:ok', function (e, buffer, data) {
-            _this.logger('SCREENSHOTS:ok', buffer, data);
+            _this.logger('SCREENSHOTS:ok buffer.length %d, data: %o', buffer.length, data);
             var event = new event_1.default();
             _this.emit('ok', event, buffer, data);
             if (event.defaultPrevented) {
@@ -406,7 +407,7 @@ var Screenshots = /** @class */ (function (_super) {
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        this.logger('SCREENSHOTS:save', buffer, data);
+                        this.logger('SCREENSHOTS:save buffer.length %d, data: %o', buffer.length, data);
                         event = new event_1.default();
                         this.emit('save', event, buffer, data);
                         if (event.defaultPrevented || !this.$win) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "electron-screenshots",
-  "version": "0.5.15",
+  "version": "0.5.17",
   "description": "electron 截图插件",
   "types": "lib/screenshots.d.ts",
   "main": "lib/screenshots.js",
@@ -38,7 +38,7 @@
     "debug": "^4.3.3",
     "fs-extra": "^10.1.0",
     "node-screenshots": "^0.1.1",
-    "react-screenshots": "^0.5.15"
+    "react-screenshots": "^0.5.16"
   },
   "peerDependencies": {
     "electron": ">=14"
@@ -58,5 +58,5 @@
     "rimraf": "^3.0.2",
     "typescript": "^4.5.5"
   },
-  "gitHead": "d93a013b046e1e03f2b408b33685af390111b2fb"
+  "gitHead": "39c5f304a9259eada15b8b44a6d5674f0805facb"
 }