yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

effects/screenshot: Provide screenshot scale information

Browse source
This commit is contained in:
Vlad Zahorodnii 2023-03-17 17:16:08 +02:00
parent 1b1f0c6b32
commit 1f7975e271
2 changed files with 22 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/effects/screenshot/org.kde.KWin.ScreenShot2.xml
View file

@ -55,6 +55,9 @@
Available only if the image type is "raw" Available only if the image type is "raw"
* "windowId" (s): The window id of the captured window. Available * "windowId" (s): The window id of the captured window. Available
since version 4. since version 4.
* "scale" (d): The ratio between the native size and the logical
size of the contents, corresponds to QImage::devicePixelRatio().
Available since version 4.
--> -->
<method name="CaptureWindow"> <method name="CaptureWindow">
<arg name="handle" type="s" direction="in" /> <arg name="handle" type="s" direction="in" />
@ -100,6 +103,9 @@
Available only if the image type is "raw" Available only if the image type is "raw"
* "windowId" (s): The window id of the captured window. Available * "windowId" (s): The window id of the captured window. Available
since version 4. since version 4.
* "scale" (d): The ratio between the native size and the logical
size of the contents, corresponds to QImage::devicePixelRatio().
Available since version 4.
--> -->
<method name="CaptureActiveWindow"> <method name="CaptureActiveWindow">
<annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QVariantMap" /> <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QVariantMap" />
@ -142,6 +148,9 @@
image type is "raw" image type is "raw"
* "format" (u): The image format, as defined in QImage::Format. * "format" (u): The image format, as defined in QImage::Format.
Available only if the image type is "raw" Available only if the image type is "raw"
* "scale" (d): The ratio between the native size and the logical
size of the contents, corresponds to QImage::devicePixelRatio().
Available since version 4.
--> -->
<method name="CaptureArea"> <method name="CaptureArea">
<arg name="x" type="i" direction="in" /> <arg name="x" type="i" direction="in" />
@ -187,6 +196,9 @@
Available only if the image type is "raw" Available only if the image type is "raw"
* "screen" (s): The name of the captured screen, same as QScreen::name(). * "screen" (s): The name of the captured screen, same as QScreen::name().
Available since version 4 Available since version 4
* "scale" (d): The ratio between the native size and the logical
size of the contents, corresponds to QImage::devicePixelRatio().
Available since version 4.
--> -->
<method name="CaptureScreen"> <method name="CaptureScreen">
<arg name="name" type="s" direction="in" /> <arg name="name" type="s" direction="in" />
@ -230,6 +242,9 @@
Available only if the image type is "raw" Available only if the image type is "raw"
* "screen" (s): The name of the captured screen, same as QScreen::name(). * "screen" (s): The name of the captured screen, same as QScreen::name().
Available since version 4 Available since version 4
* "scale" (d): The ratio between the native size and the logical
size of the contents, corresponds to QImage::devicePixelRatio().
Available since version 4.
--> -->
<method name="CaptureActiveScreen"> <method name="CaptureActiveScreen">
<annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QVariantMap" /> <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QVariantMap" />
@ -268,6 +283,9 @@
image type is "raw" image type is "raw"
* "format" (u): The image format, as defined in QImage::Format. * "format" (u): The image format, as defined in QImage::Format.
Available only if the image type is "raw" Available only if the image type is "raw"
* "scale" (d): The ratio between the native size and the logical
size of the contents, corresponds to QImage::devicePixelRatio().
Available since version 4.
The following results get returned when taking a window screenshot: The following results get returned when taking a window screenshot:
@ -319,6 +337,9 @@
image type is "raw" image type is "raw"
* "format" (u): The image format, as defined in QImage::Format. * "format" (u): The image format, as defined in QImage::Format.
Available only if the image type is "raw" Available only if the image type is "raw"
* "scale" (d): The ratio between the native size and the logical
size of the contents, corresponds to QImage::devicePixelRatio().
Available since version 4.
--> -->
<method name="CaptureWorkspace"> <method name="CaptureWorkspace">
<annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QVariantMap" /> <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QVariantMap" />

1
src/effects/screenshot/screenshotdbusinterface2.cpp
View file

@ -284,6 +284,7 @@ void ScreenShotSinkPipe2::flush(const QImage &image, const QVariantMap &attribut
results.insert(QStringLiteral("width"), quint32(image.width())); results.insert(QStringLiteral("width"), quint32(image.width()));
results.insert(QStringLiteral("height"), quint32(image.height())); results.insert(QStringLiteral("height"), quint32(image.height()));
results.insert(QStringLiteral("stride"), quint32(image.bytesPerLine())); results.insert(QStringLiteral("stride"), quint32(image.bytesPerLine()));
results.insert(QStringLiteral("scale"), double(image.devicePixelRatio()));
QDBusConnection::sessionBus().send(m_replyMessage.createReply(results)); QDBusConnection::sessionBus().send(m_replyMessage.createReply(results));
QtConcurrent::run([fileDescriptor = std::move(m_fileDescriptor), image]() mutable { QtConcurrent::run([fileDescriptor = std::move(m_fileDescriptor), image]() mutable {