diff --git a/sources/appl/Gui/TextViewer.cpp b/sources/appl/Gui/TextViewer.cpp index c181cb1..451de22 100644 --- a/sources/appl/Gui/TextViewer.cpp +++ b/sources/appl/Gui/TextViewer.cpp @@ -35,7 +35,6 @@ appl::TextViewer::TextViewer(const std::string& _fontName, int32_t _fontSize) : addObjectType("appl::TextViewer"); setCanHaveFocus(true); registerMultiCast(ednMsgBufferId); - registerMultiCast(ednMsgGuiRm); registerMultiCast(ednMsgGuiSelect); registerMultiCast(ednMsgGuiFind); registerMultiCast(ednMsgGuiReplace); @@ -43,8 +42,6 @@ appl::TextViewer::TextViewer(const std::string& _fontName, int32_t _fontSize) : registerMultiCast(appl::MsgSelectNewFile); setLimitScrolling(0.2); - shortCutAdd("ctrl+w", ednMsgGuiRm, "Line"); - shortCutAdd("ctrl+shift+w", ednMsgGuiRm, "Paragraph"); shortCutAdd("ctrl+a", ednMsgGuiSelect, "ALL"); shortCutAdd("ctrl+shift+a", ednMsgGuiSelect, "NONE"); @@ -521,14 +518,12 @@ void appl::TextViewer::mouseEventDouble(void) { moveCursor(endPos); m_buffer->setSelectionPos(beginPos); } - // TODO : copy(ewol::clipBoard::clipboardSelection); } void appl::TextViewer::mouseEventTriple(void) { //m_selectMode = false; moveCursor(m_buffer->getEndLine(m_buffer->cursor())); m_buffer->setSelectionPos(m_buffer->getStartLine(m_buffer->cursor())); - // TODO : copy(ewol::clipBoard::clipboardSelection); } appl::Buffer::Iterator appl::TextViewer::getMousePosition(const vec2& _relativePos) { @@ -546,7 +541,6 @@ appl::Buffer::Iterator appl::TextViewer::getMousePosition(const vec2& _relativeP m_buffer->expand(countColomn, currentValue, stringToDisplay); for (size_t kkk=0; kkk= positionCurentDisplay.y()) { m_displayText.print(stringToDisplay[kkk]); } + ++countColomn; } } if (-_relativePos.y() >= positionCurentDisplay.y()) { if (-_relativePos.y() < positionCurentDisplay.y()+tmpLetterSize.y()) { - //APPL_DEBUG("line position : " << _textDrawer.getPos() << " " << positionCurentDisplay ); + APPL_VERBOSE("line position : '" << (char)(*it) << "' = '" << stringToDisplay << "' n=" << countColomn << " " <= positionCurentDisplay.x() && _relativePos.x() < m_displayText.getPos().x() ) { + APPL_VERBOSE("find ..."); return it; } } else { + // previous line ... return --it; } } positionCurentDisplay = m_displayText.getPos(); - countColomn += stringToDisplay.size(); } return m_buffer->end(); }