I have no idea

This commit is contained in:
ArsenArsen 2017-05-19 22:32:23 +02:00
parent 7c58d37ab0
commit 6a978fbfb3
5 changed files with 28 additions and 9 deletions

1
--force Submodule

@ -0,0 +1 @@
Subproject commit f7839bedd9c9d28d4eb2e9a07c1e30e908783f63

View File

@ -73,7 +73,9 @@ HEADERS += mainwindow.hpp \
cropeditor/drawing/lineitem.hpp \
cropeditor/drawing/textitem.hpp \
colorpicker/colorpickerscene.hpp \
platformbackend.hpp
platformbackend.hpp \
gif-h/gif.h
mac {
SOURCES += $$PWD/platformspecifics/mac/macbackend.cpp
HEADERS += $$PWD/platformspecifics/mac/macbackend.hpp

View File

@ -1,10 +1,7 @@
#include "mainwindow.hpp"
#include <QApplication>
#include <QCommandLineParser>
#include <QTimer>
#include <QtGlobal>
#include <colorpicker/colorpickerscene.hpp>
#include <screenshotutil.hpp>
#include <stdio.h>
bool verbose = false;
@ -13,10 +10,10 @@ void handler(QtMsgType type, const QMessageLogContext &, const QString &msg) {
QByteArray localMsg = msg.toLocal8Bit();
switch (type) {
case QtDebugMsg:
if (verbose) fprintf(stderr, "DEBUG: %s\n", localMsg.constData());
if (verbose) fprintf(stdout, "DEBUG: %s\n", localMsg.constData());
break;
case QtInfoMsg:
fprintf(stderr, "INFO: %s\n", localMsg.constData());
fprintf(stdout, "INFO: %s\n", localMsg.constData());
break;
case QtWarningMsg:
fprintf(stderr, "WARN: %s\n", localMsg.constData());

View File

@ -21,7 +21,7 @@ QPixmap *screenshotutil::fullscreen(bool cursor) {
return window(0);
}
QPixmap *screenshotutil::window(long wid) {
QPixmap *screenshotutil::window(WId wid) {
QScreen *w = QApplication::primaryScreen();
QPixmap screen = w->grabWindow(wid);
QPixmap *pm = new QPixmap(screen.size());
@ -32,3 +32,21 @@ QPixmap *screenshotutil::window(long wid) {
void screenshotutil::toClipboard(QString value) {
QApplication::clipboard()->setText(value);
}
QPixmap *screenshotutil::fullscreenArea(bool cursor, qreal x, qreal y, qreal w, qreal h) {
auto scr = QApplication::primaryScreen();
QRectF area(x, y, w < 0 ? scr->size().width() : w, h < 0 ? scr->size().height() : h);
if (cursor) {
QPointF point = QCursor::pos(scr);
if (area.contains(point)) {
QPixmap noCursor = scr->grabWindow(0, area.x(), area.y(), area.width(), area.height());
QPixmap *withCursor = new QPixmap(noCursor);
QPainter painter(withCursor);
auto cursorData = PlatformBackend::inst().getCursor();
painter.drawPixmap(QCursor::pos() - std::get<0>(cursorData), std::get<1>(cursorData));
painter.end();
return withCursor;
}
}
return new QPixmap(scr->grabWindow(0, area.x(), area.y(), area.width(), area.height()));
}

View File

@ -1,11 +1,12 @@
#ifndef SCREENSHOTUTIL_HPP
#define SCREENSHOTUTIL_HPP
#include <QPixmap>
#include <QWidget>
namespace screenshotutil {
QPixmap *fullscreen(bool cursor = true);
QPixmap *window(long wid);
QPixmap *fullscreenArea(bool cursor = true, qreal x = 0, qreal y = 0, qreal w = -1, qreal h = -1);
QPixmap *window(WId wid);
void toClipboard(QString value);
}