isa/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

screenshot: Scale and unscale the area for HiDpi displays

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=731738
This commit is contained in:
Debarshi Ray 2014-06-16 20:28:17 +02:00
parent 5852c17f76
commit ba6a2cae9c
1 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
js/ui/screenshot.js
View File

@ -84,8 +84,27 @@ const ScreenshotService = new Lang.Class({
invocation.return_value(retval); invocation.return_value(retval);
}, },
_scaleArea: function(x, y, width, height) {
let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
x *= scaleFactor;
y *= scaleFactor;
width *= scaleFactor;
height *= scaleFactor;
return [x, y, width, height];
},
_unscaleArea: function(x, y, width, height) {
let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
x /= scaleFactor;
y /= scaleFactor;
width /= scaleFactor;
height /= scaleFactor;
return [x, y, width, height];
},
ScreenshotAreaAsync : function (params, invocation) { ScreenshotAreaAsync : function (params, invocation) {
let [x, y, width, height, flash, filename, callback] = params; let [x, y, width, height, flash, filename, callback] = params;
[x, y, width, height] = this._scaleArea(x, y, width, height);
if (!this._checkArea(x, y, width, height)) { if (!this._checkArea(x, y, width, height)) {
invocation.return_error_literal(Gio.IOErrorEnum, invocation.return_error_literal(Gio.IOErrorEnum,
Gio.IOErrorEnum.CANCELLED, Gio.IOErrorEnum.CANCELLED,
@ -120,9 +139,9 @@ const ScreenshotService = new Lang.Class({
selectArea.connect('finished', Lang.bind(this, selectArea.connect('finished', Lang.bind(this,
function(selectArea, areaRectangle) { function(selectArea, areaRectangle) {
if (areaRectangle) { if (areaRectangle) {
let retval = GLib.Variant.new('(iiii)', let retRectangle = this._unscaleArea(areaRectangle.x, areaRectangle.y,
[areaRectangle.x, areaRectangle.y, areaRectangle.width, areaRectangle.height);
areaRectangle.width, areaRectangle.height]); let retval = GLib.Variant.new('(iiii)', retRectangle);
invocation.return_value(retval); invocation.return_value(retval);
} else { } else {
invocation.return_error_literal(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED, invocation.return_error_literal(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED,
@ -133,6 +152,7 @@ const ScreenshotService = new Lang.Class({
FlashAreaAsync: function(params, invocation) { FlashAreaAsync: function(params, invocation) {
let [x, y, width, height] = params; let [x, y, width, height] = params;
[x, y, width, height] = this._scaleArea(x, y, width, height);
if (!this._checkArea(x, y, width, height)) { if (!this._checkArea(x, y, width, height)) {
invocation.return_error_literal(Gio.IOErrorEnum, invocation.return_error_literal(Gio.IOErrorEnum,
Gio.IOErrorEnum.CANCELLED, Gio.IOErrorEnum.CANCELLED,