StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

Screen grabber: Show correct tooltip for selected/no-selection states

Browse Source 
When the user just clicks somewhere, and thus rejects the selection due
to the previous commit, show the initial 'nothing selected' helper
tooltip again.
This commit is contained in:
Stefan Merettig 2015-03-26 16:43:49 +01:00 committed by tux3
parent 96a1cf93d5
commit db8b70e225
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/widget/tool/screenshotgrabber.cpp
View File

@ -119,32 +119,41 @@ void ScreenshotGrabber::setupScene(QGraphicsScene* scene)
useNothingSelectedTooltip(); useNothingSelectedTooltip();
connect(this->chooserRect, &ScreenGrabberChooserRectItem::doubleClicked, this, &ScreenshotGrabber::acceptRegion); connect(this->chooserRect, &ScreenGrabberChooserRectItem::doubleClicked, this, &ScreenshotGrabber::acceptRegion);
connect(this->chooserRect, &ScreenGrabberChooserRectItem::regionChosen, this, &ScreenshotGrabber::useRegionSelectedTooltip); connect(this->chooserRect, &ScreenGrabberChooserRectItem::regionChosen, this, &ScreenshotGrabber::chooseHelperTooltipText);
connect(this->chooserRect, &ScreenGrabberChooserRectItem::regionChosen, this->overlay, &ScreenGrabberOverlayItem::setChosenRect); connect(this->chooserRect, &ScreenGrabberChooserRectItem::regionChosen, this->overlay, &ScreenGrabberOverlayItem::setChosenRect);
} }
void ScreenshotGrabber::useNothingSelectedTooltip() void ScreenshotGrabber::useNothingSelectedTooltip()
{ {
this->helperTooltip->setHtml(tr("Click and drag to select a region. Press <b>Escape</b> to cancel.", helperTooltip->setHtml(tr("Click and drag to select a region. Press <b>Escape</b> to cancel.",
"Help text shown when no region has been selected yet")); "Help text shown when no region has been selected yet"));
adjustTooltipPosition(); adjustTooltipPosition();
} }
void ScreenshotGrabber::useRegionSelectedTooltip() void ScreenshotGrabber::useRegionSelectedTooltip()
{ {
this->helperTooltip->setHtml(tr("Press <b>Enter</b> to send a screenshot of the selected region or select a new region. Press <b>Escape</b> to cancel.", helperTooltip->setHtml(tr("Press <b>Enter</b> to send a screenshot of the selected region or select a new region. Press <b>Escape</b> to cancel.",
"Help text shown when a region has been selected")); "Help text shown when a region has been selected"));
adjustTooltipPosition(); adjustTooltipPosition();
} }
void ScreenshotGrabber::chooseHelperTooltipText(QRect rect)
{
if (rect.size().isNull())
useNothingSelectedTooltip();
else
useRegionSelectedTooltip();
}
void ScreenshotGrabber::adjustTooltipPosition() void ScreenshotGrabber::adjustTooltipPosition()
{ {
QRectF size = this->helperToolbox->childrenBoundingRect(); QRectF size = this->helperToolbox->childrenBoundingRect();
QRect screenRect = QApplication::desktop()->screen()->rect(); QRect screenRect = QApplication::desktop()->screen()->rect();
// Align the toolbox center-top. // Align the toolbox center-top.
this->helperToolbox->setX(screenRect.x() + (screenRect.width() - size.width() + size.x()) / 2); helperToolbox->setX(screenRect.x() + (screenRect.width() - size.width() + size.x()) / 2);
this->helperToolbox->setY(screenRect.y()); helperToolbox->setY(screenRect.y());
} }

1
src/widget/tool/screenshotgrabber.h
View File

@ -58,6 +58,7 @@ private:
void useNothingSelectedTooltip(); void useNothingSelectedTooltip();
void useRegionSelectedTooltip(); void useRegionSelectedTooltip();
void chooseHelperTooltipText(QRect rect);
void adjustTooltipPosition(); void adjustTooltipPosition();
bool handleKeyPress(QKeyEvent* event); bool handleKeyPress(QKeyEvent* event);