benkyd/flameshot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add --region option (#2013)

Browse Source 
* Fix empty help message bug

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Add --region option

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Fix: initial selection even without --region

* Enable 'full --region'

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Enable 'screen --region'

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Allow negative width/height

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Fix screen intersection bug

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Change output format of --print-geometry

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>
This commit is contained in:
Haris Gušić
2021-11-08 22:59:46 +01:00
committed by GitHub
parent df5d99321a
commit 6432490c31
11 changed files with 257 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/widgets/capture/capturewidget.cpp
View File

@@ -91,8 +91,6 @@ CaptureWidget::CaptureWidget(uint id,
m_contrastUiColor = m_config.contrastUiColor();
setMouseTracking(true);
initContext(fullScreen, id);
initSelection();
initShortcuts(); // must be called after initSelection
#if (defined(Q_OS_WIN) || defined(Q_OS_MACOS))
// Top left of the whole set of screens
QPoint topLeft(0, 0);
@@ -143,9 +141,6 @@ CaptureWidget::CaptureWidget(uint id,
#endif
#endif
}
// Create buttons
m_buttonHandler = new ButtonHandler(this);
initButtons();
QVector<QRect> areas;
if (m_context.fullscreen) {
QPoint topLeftOffset = QPoint(0, 0);
@@ -176,9 +171,15 @@ CaptureWidget::CaptureWidget(uint id,
} else {
areas.append(rect());
}
m_buttonHandler = new ButtonHandler(this);
m_buttonHandler->updateScreenRegions(areas);
m_buttonHandler->hide();
initButtons();
initSelection(); // button handler must be initialized before
initShortcuts(); // must be called after initSelection
// Init color picker
m_colorPicker = new ColorPicker(this);
connect(m_colorPicker,
@@ -1037,11 +1038,10 @@ void CaptureWidget::showAppUpdateNotification(const QString& appLatestVersion,
void CaptureWidget::initSelection()
{
// Be mindful of the order of statements, so that slots are called properly
m_selection = new SelectionWidget(m_uiColor, this);
m_selection->setVisible(false);
m_selection->setGeometry(QRect());
QRect initialSelection = m_context.request()->initialSelection();
connect(m_selection, &SelectionWidget::geometryChanged, this, [this]() {
m_buttonHandler->updatePosition(m_selection->geometry());
QRect constrainedToCaptureArea =
m_selection->geometry().intersected(rect());
m_context.selection = extendedRect(constrainedToCaptureArea);
@@ -1051,9 +1051,10 @@ void CaptureWidget::initSelection()
OverlayMessage::pop();
});
connect(m_selection, &SelectionWidget::geometrySettled, this, [this]() {
if (m_selection->isVisible()) {
if (m_selection->isVisibleTo(this)) {
auto req = m_context.request();
if (req->tasks() & CaptureRequest::ACCEPT_ON_SELECT) {
req->removeTask(CaptureRequest::ACCEPT_ON_SELECT);
m_captureDone = true;
if (req->tasks() & CaptureRequest::PIN) {
QRect geometry = m_context.selection;
@@ -1063,16 +1064,27 @@ void CaptureWidget::initSelection()
}
close();
}
m_buttonHandler->updatePosition(m_selection->geometry());
m_buttonHandler->show();
} else {
m_buttonHandler->hide();
}
});
connect(m_selection, &SelectionWidget::visibilityChanged, this, [this]() {
if (!m_selection->isVisible()) {
if (!m_selection->isVisible() && !m_helpMessage.isEmpty()) {
OverlayMessage::push(m_helpMessage);
}
});
if (!initialSelection.isNull()) {
initialSelection.moveTopLeft(initialSelection.topLeft() -
mapToGlobal({}));
}
m_selection->setGeometry(initialSelection);
m_selection->setVisible(!initialSelection.isNull());
if (!initialSelection.isNull()) {
m_context.selection = extendedRect(m_selection->geometry());
emit m_selection->geometrySettled();
}
}
void CaptureWidget::setState(CaptureToolButton* b)