nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fbtk, textbox, overflow selection deselection

Browse source 
changes the selection's deselection mechanism for oversized (e.g
larger than window width) text

new behaviour ensures the maximum selection width remains whilst
the selection length is 'oversized'. only when the selection length
has a width less than the window width will the selection (i.e. the
highlight / inverted colours) reduce in size

this is in contrast to the existing approach which would immediately
decrease an oversized selection down to nothing visually, leaving
the remainder of the selection 'off screen'. this 'looks like nothing
is selected' when in fact it is, gives a poor UX
This commit is contained in:
Pete Beardmore 2018-03-04 22:49:44 +00:00 committed by Mathias Gumz
parent f19bb5787f
commit ca0995bdec
1 changed files with 27 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/FbTk/TextBox.cc
View file

@ -123,6 +123,18 @@ void TextBox::cursorEnd() {
void TextBox::cursorForward() {
StringRange r = charRange(m_start_pos + cursorPosition());
const std::string::size_type s = r.end - r.begin + 1;
if (hasSelection()) {
int start = std::max(m_start_pos, std::min(m_start_pos + m_cursor_pos, m_select_pos));
int select_length = std::max(m_start_pos + m_cursor_pos, m_select_pos) - start;
if (select_length > static_cast<signed>(m_end_pos - m_start_pos)) {
// shift range
m_start_pos += s;
m_end_pos += s;
adjustPos();
}
}
if (r.end < m_end_pos)
m_cursor_pos = r.end + 1 - m_start_pos;
else if (m_end_pos < text().size()) {
@ -133,9 +145,22 @@ void TextBox::cursorForward() {
}
void TextBox::cursorBackward() {
StringRange r = charRange(m_start_pos + cursorPosition() - 1);
const std::string::size_type s = r.end - r.begin + 1;
if (hasSelection()) {
int end = std::max(m_end_pos, std::min(m_end_pos - m_cursor_pos, m_select_pos));
int select_length = end - std::min(m_end_pos - m_cursor_pos, m_select_pos);
if (select_length > static_cast<signed>(m_end_pos - m_start_pos)) {
// shift range
m_start_pos -= s;
m_end_pos -= s;
adjustPos();
}
}
if (m_start_pos || cursorPosition()) {
StringRange r = charRange(m_start_pos + cursorPosition() - 1);
const std::string::size_type s = r.end - r.begin + 1;
if (cursorPosition())
m_cursor_pos = r.begin - m_start_pos;
else if (m_start_pos) {