Skip to content

Commit

Permalink
Fix HScrollBar of TextEdit, closes #2355
Browse files Browse the repository at this point in the history
  • Loading branch information
Franklin Sobrinho committed Sep 9, 2015
1 parent b0aa49a commit 26a7152
Showing 1 changed file with 8 additions and 5 deletions.
13 changes: 8 additions & 5 deletions scene/gui/text_edit.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,9 @@ void TextEdit::Text::set_tab_size(int p_tab_size) {

void TextEdit::Text::_update_line_cache(int p_line) const {

int w =0;
int tab_w=font->get_char_size(' ').width;
int w = 0;
int tab_w=font->get_char_size(' ').width*tab_size;

int len = text[p_line].data.length();
const CharType *str = text[p_line].data.c_str();

Expand Down Expand Up @@ -292,7 +292,10 @@ void TextEdit::_update_scrollbars() {

int vscroll_pixels = v_scroll->get_combined_minimum_size().width;
int visible_width = size.width - cache.style_normal->get_minimum_size().width;
int total_width = text.get_max_width();
int total_width = text.get_max_width() + vmin.x;

if (line_numbers)
total_width += cache.line_number_w;

bool use_hscroll=true;
bool use_vscroll=true;
Expand Down Expand Up @@ -322,7 +325,6 @@ void TextEdit::_update_scrollbars() {
v_scroll->show();
v_scroll->set_max(total_rows);
v_scroll->set_page(visible_rows);

v_scroll->set_val(cursor.line_ofs);

} else {
Expand All @@ -336,6 +338,7 @@ void TextEdit::_update_scrollbars() {
h_scroll->set_max(total_width);
h_scroll->set_page(visible_width);
h_scroll->set_val(cursor.x_ofs);

} else {

h_scroll->hide();
Expand Down

0 comments on commit 26a7152

Please sign in to comment.