asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #14352 from ianb96/get_hidden_width

Browse source 
Fixes horizontal scrolling over hidden lines
This commit is contained in:
Rémi Verschelde 2017-12-07 07:52:01 +01:00 committed by GitHub
commit 8a07cb0b69
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
scene/gui/text_edit.cpp
View file

@ -251,13 +251,14 @@ void TextEdit::Text::clear() {
insert(0, ""); insert(0, "");
} }
int TextEdit::Text::get_max_width() const { int TextEdit::Text::get_max_width(bool p_exclude_hidden) const {
//quite some work.. but should be fast enough. //quite some work.. but should be fast enough.
int max = 0; int max = 0;
for (int i = 0; i < text.size(); i++) {
for (int i = 0; i < text.size(); i++) if (!p_exclude_hidden || !is_hidden(i))
max = MAX(max, get_line_width(i)); max = MAX(max, get_line_width(i));
}
return max; return max;
} }
@ -307,7 +308,7 @@ void TextEdit::_update_scrollbars() {
int vscroll_pixels = v_scroll->get_combined_minimum_size().width; int vscroll_pixels = v_scroll->get_combined_minimum_size().width;
int visible_width = size.width - cache.style_normal->get_minimum_size().width; int visible_width = size.width - cache.style_normal->get_minimum_size().width;
int total_width = text.get_max_width() + vmin.x; int total_width = text.get_max_width(true) + vmin.x;
if (line_numbers) if (line_numbers)
total_width += cache.line_number_w; total_width += cache.line_number_w;
@ -360,6 +361,7 @@ void TextEdit::_update_scrollbars() {
} }
} else { } else {
cursor.line_ofs = 0; cursor.line_ofs = 0;
line_scroll_pos = 0; line_scroll_pos = 0;
v_scroll->set_value(0); v_scroll->set_value(0);
@ -371,12 +373,16 @@ void TextEdit::_update_scrollbars() {
h_scroll->show(); h_scroll->show();
h_scroll->set_max(total_width); h_scroll->set_max(total_width);
h_scroll->set_page(visible_width); h_scroll->set_page(visible_width);
if (cursor.x_ofs > (total_width - visible_width))
cursor.x_ofs = (total_width - visible_width);
if (fabs(h_scroll->get_value() - (double)cursor.x_ofs) >= 1) { if (fabs(h_scroll->get_value() - (double)cursor.x_ofs) >= 1) {
h_scroll->set_value(cursor.x_ofs); h_scroll->set_value(cursor.x_ofs);
} }
} else { } else {
cursor.x_ofs = 0;
h_scroll->set_value(0);
h_scroll->hide(); h_scroll->hide();
} }

2
scene/gui/text_edit.h
View file

@ -159,7 +159,7 @@ class TextEdit : public Control {
void set_font(const Ref<Font> &p_font); void set_font(const Ref<Font> &p_font);
void set_color_regions(const Vector<ColorRegion> *p_regions) { color_regions = p_regions; } void set_color_regions(const Vector<ColorRegion> *p_regions) { color_regions = p_regions; }
int get_line_width(int p_line) const; int get_line_width(int p_line) const;
int get_max_width() const; int get_max_width(bool p_exclude_hidden = false) const;
const Map<int, ColorRegionInfo> &get_color_region_info(int p_line); const Map<int, ColorRegionInfo> &get_color_region_info(int p_line);
void set(int p_line, const String &p_text); void set(int p_line, const String &p_text);
void set_marked(int p_line, bool p_marked) { text[p_line].marked = p_marked; } void set_marked(int p_line, bool p_marked) { text[p_line].marked = p_marked; }