mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-02-18 21:40:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't scroll Entry text if it isn't needed

Browse Source
This commit is contained in:
David Capello 2014-02-08 18:46:27 -03:00
parent f954556683
commit 721734d26c
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/ui/entry.cpp
View File

@ -309,7 +309,7 @@ bool Entry::onProcessMessage(Message* msg)
} }
// Forward scroll // Forward scroll
else if (mousePos.x >= getBounds().x2()) { else if (mousePos.x >= getBounds().x2()) {
if (m_scroll < textlen) { if (m_scroll < textlen - getAvailableTextLength()) {
m_scroll++; m_scroll++;
x = getBounds().x + this->border_width.l; x = getBounds().x + this->border_width.l;
for (c=m_scroll; utf8_begin != utf8_end; ++c) { for (c=m_scroll; utf8_begin != utf8_end; ++c) {
@ -682,4 +682,9 @@ void Entry::backwardWord()
m_caret = 0; m_caret = 0;
} }
int Entry::getAvailableTextLength()
{
return getClientChildrenBounds().w / ji_font_char_len(getFont(), 'w');
}
} // namespace ui } // namespace ui

1
src/ui/entry.h
View File

@ -77,6 +77,7 @@ namespace ui {
void executeCmd(EntryCmd::Type cmd, int ascii, bool shift_pressed); void executeCmd(EntryCmd::Type cmd, int ascii, bool shift_pressed);
void forwardWord(); void forwardWord();
void backwardWord(); void backwardWord();
int getAvailableTextLength();
size_t m_maxsize; size_t m_maxsize;
int m_caret; int m_caret;