r20596 by jghali -
scribus-commit
scribus-commit at lists.scribus.net
Sat Nov 28 00:18:43 UTC 2015
Author: jghali
Date: Sat Nov 28 00:18:43 2015
New Revision: 20596
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=20596
Log:
#13571: Copy not available for text selected by double-click
Modified:
trunk/Scribus/scribus/canvasmode_edit.cpp
Modified: trunk/Scribus/scribus/canvasmode_edit.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20596&path=/trunk/Scribus/scribus/canvasmode_edit.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_edit.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_edit.cpp Sat Nov 28 00:18:43 2015
@@ -457,12 +457,12 @@
currItem->HasSel = true;
}
}
- if(currItem->HasSel)
+ if (currItem->HasSel)
{
m_ScMW->EnableTxEdit();
m_canvas->m_viewMode.operTextSelecting = true;
- if((refStartSel != currItem->asTextFrame()->itemText.startOfSelection())
- || (refEndSel != currItem->asTextFrame()->itemText.endOfSelection()))
+ if ((refStartSel != currItem->asTextFrame()->itemText.startOfSelection()) ||
+ (refEndSel != currItem->asTextFrame()->itemText.endOfSelection()))
{
QRectF br(currItem->getBoundingRect());
m_canvas->update(QRectF(m_canvas->canvasToLocal(br.topLeft()), br.size() * m_canvas->scale()).toRect());
@@ -470,7 +470,6 @@
}
else
m_ScMW->DisableTxEdit();
-
}
}
if (!m_canvas->m_viewMode.m_MouseButtonPressed)
@@ -940,6 +939,13 @@
currItem = m_doc->m_Selection->itemAt(0);
m_doc->nodeEdit.finishTransaction(currItem);
}
+ if (GetItem(&currItem) && currItem->asTextFrame())
+ {
+ if (currItem->itemText.lengthOfSelection() > 0)
+ m_ScMW->EnableTxEdit();
+ else
+ m_ScMW->DisableTxEdit();
+ }
}
//CB-->Doc/Fix
More information about the scribus-commit
mailing list