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

NC/Fixes for 0.10.0 Beta (crash and some others) (#1631)

Browse Source 
* fix - crash if during editing text add any object

(cherry picked from commit f5ae7c083965a4a65bd39ff554d667a1e68c4b37)

* fix - Phantom is displayed on a screen if the figure was moved after double click on it and the last changes were undo and redo

(cherry picked from commit 181979162fc7b2c398d7c84e95526ebb4fa4780f)

* fix - Undo tool undo the last created object instead undo changing if click undo during editing object

(cherry picked from commit 27bbb3a3b29718d476b9f8d98a0efa9fa12f16c2)

Co-authored-by: Yuriy Puchkov <yuriy.puchkov@namecheap.com>
This commit is contained in:
Yurii Puchkov
2021-05-18 15:58:33 +03:00
committed by GitHub
parent 9398b580f9
commit ed3491f366
1 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -524,8 +524,9 @@ void CaptureWidget::mouseDoubleClickEvent(QMouseEvent* event)
int activeLayerIndex = m_panel->activeLayerIndex();
if (activeLayerIndex != -1) {
// Start object editing
m_activeTool = m_captureToolObjects.at(activeLayerIndex);
if (m_activeTool && m_activeTool->nameID() == ToolType::TEXT) {
auto activeTool = m_captureToolObjects.at(activeLayerIndex);
if (activeTool && activeTool->nameID() == ToolType::TEXT) {
m_activeTool = activeTool;
m_mouseIsClicked = false;
m_context.mousePos = *m_activeTool->pos();
m_captureToolObjectsBackup = m_captureToolObjects;
@@ -1199,6 +1200,13 @@ void CaptureWidget::updateActiveLayer(const int& layer)
m_activeTool->isChanged()) {
commitCurrentTool();
}
if (m_toolWidget) {
// Release active tool if it is in the editing mode but not changed and
// has editing widget (ex: text tool)
releaseActiveTool();
}
if (m_existingObjectIsChanged) {
m_existingObjectIsChanged = false;
pushObjectsStateToUndoStack();
@@ -1606,6 +1614,13 @@ void CaptureWidget::setCaptureToolObjects(
void CaptureWidget::undo()
{
if (m_activeTool &&
(m_activeTool->isChanged() || m_activeTool->editMode())) {
// Remove selection on undo, at the same time commit current tool will
// be called
m_panel->setActiveLayer(-1);
}
m_undoStack.undo();
drawToolsData();
}