Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 25166 → Rev 25167

/trunk/Scribus/scribus/pageitem_textframe.cpp
4028,17 → 4028,16
itemText.setCursorPosition (lastInFrame() + 1);
ExpandSel(oldPos);
}
else
if ((textLayout.lines() > 0) && (oldPos >= textLayout.line(textLayout.lines() - 1)->firstChar()) && (itemText.cursorPosition() >= lastInFrame()) && (m_nextBox != nullptr))
else if ((textLayout.lines() > 0) && (oldPos >= textLayout.line(textLayout.lines() - 1)->firstChar()) && (itemText.cursorPosition() >= lastInFrame()) && (m_nextBox != nullptr))
{
if (m_nextBox->frameDisplays(itemText.cursorPosition()))
{
if (m_nextBox->frameDisplays(itemText.cursorPosition()))
{
view->deselectItems(true);
// we position the cursor at the beginning of the next frame
// TODO position at the right place in next frame
m_Doc->scMW()->selectItemsFromOutlines(m_nextBox);
}
view->deselectItems(true);
// we position the cursor at the beginning of the next frame
// TODO position at the right place in next frame
m_Doc->scMW()->selectItemsFromOutlines(m_nextBox);
}
}
}
else
{
4079,14 → 4078,13
itemText.setCursorPosition( firstInFrame() );
ExpandSel(oldPos);
}
else
if ((textLayout.lines() > 0) && (oldPos <= textLayout.line(0)->lastChar()) && (itemText.cursorPosition() == firstInFrame()) && (m_backBox != nullptr))
{
view->deselectItems(true);
// TODO position at the right place in previous frame
m_backBox->itemText.setCursorPosition( m_backBox->lastInFrame() );
m_Doc->scMW()->selectItemsFromOutlines(m_backBox);
}
else if ((textLayout.lines() > 0) && (oldPos <= textLayout.line(0)->lastChar()) && (itemText.cursorPosition() == firstInFrame()) && (m_backBox != nullptr))
{
view->deselectItems(true);
// TODO position at the right place in previous frame
m_backBox->itemText.setCursorPosition( m_backBox->lastInFrame() );
m_Doc->scMW()->selectItemsFromOutlines(m_backBox);
}
}
else
{