Skip to content

Commit 34cf005

Browse files
committed
InputTextMultiline: Fixed vertical scrolling tracking glitch.
Fixed Travis-CI banner address.
1 parent 835b50b commit 34cf005

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

docs/CHANGELOG.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,11 @@ Other Changes:
6262
worth of asymmetrical/extraneous padding, note that there's another half that conservatively has to offset
6363
the right-most column, otherwise it's clipping width won't match the other column). (#125, #2666)
6464
- Columns: Improved honoring alignment with various values of ItemSpacing.x and WindowPadding.x. (#125, #2666)
65-
- Word-wrapping: Fixed overzealous word-wrapping when glyph edge lands exactly on the limit. Because
66-
of this, auto-fitting exactly unwrapped text would make it wrap. (fixes initial 1.15 commit, 78645a7d).
6765
- Columns: Made GetColumnOffset() and GetColumnWidth() behave when there's no column set, consistently with
6866
other column functions. (#2683)
67+
- InputTextMultiline: Fixed vertical scrolling tracking glitch.
68+
- Word-wrapping: Fixed overzealous word-wrapping when glyph edge lands exactly on the limit. Because
69+
of this, auto-fitting exactly unwrapped text would make it wrap. (fixes initial 1.15 commit, 78645a7d).
6970
- Scrolling: Added SetScrollHereX(), SetScrollFromPosX() for completeness. (#1580) [@kevreco]
7071
- Style: Attenuated default opacity of ImGuiCol_Separator in Classic and Light styles.
7172
- Style: Added style.ColorButtonPosition (left/right, defaults to ImGuiDir_Right) to move the color button

docs/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
dear imgui
22
=====
3-
[![Build Status](https://travis-ci.org/ocornut/imgui.svg?branch=master)](https://travis-ci.org/ocornut/imgui)
3+
[![Build Status](https://api.travis-ci.com/ocornut/imgui.svg?branch=master)](https://travis-ci.com/ocornut/imgui)
44
[![Coverity Status](https://scan.coverity.com/projects/4720/badge.svg)](https://scan.coverity.com/projects/4720)
55

66
_(This library is free as in freedom, but needs your support to sustain its development. In addition to maintenance and stability there are many desirable features yet to be added. If your company is using dear imgui, please consider reaching out for invoiced financial support. If you are an individual using dear imgui, please consider donating via Patreon or PayPal.)_

imgui_widgets.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3993,9 +3993,8 @@ bool ImGui::InputTextEx(const char* label, const char* hint, char* buf, int buf_
39933993
scroll_y = ImMax(0.0f, cursor_offset.y - g.FontSize);
39943994
else if (cursor_offset.y - size.y >= scroll_y)
39953995
scroll_y = cursor_offset.y - size.y;
3996-
draw_window->DC.CursorPos.y += (draw_window->Scroll.y - scroll_y); // Manipulate cursor pos immediately avoid a frame of lag
3996+
draw_pos.y += (draw_window->Scroll.y - scroll_y); // Manipulate cursor pos immediately avoid a frame of lag
39973997
draw_window->Scroll.y = scroll_y;
3998-
draw_pos.y = draw_window->DC.CursorPos.y;
39993998
}
40003999

40014000
state->CursorFollow = false;

0 commit comments

Comments
 (0)