Merge lp:~widelands-dev/widelands/bug-1785404-chat-scrolling into lp:widelands

Proposed by Notabilis on 2018-08-12
Status: Merged
Merged at revision: 8783
Proposed branch: lp:~widelands-dev/widelands/bug-1785404-chat-scrolling
Merge into: lp:widelands
Diff against target: 12 lines (+1/-1)
1 file modified
src/ui_basic/multilinetextarea.cc (+1/-1)
To merge this branch: bzr merge lp:~widelands-dev/widelands/bug-1785404-chat-scrolling
Reviewer Review Type Date Requested Status
GunChleoc Approve on 2018-08-13
Toni Förster 2018-08-12 Approve on 2018-08-12
Review via email: mp+352941@code.launchpad.net

Commit message

Fixing broken auto-scrolling of multi-line text areas.

Description of the change

Seems to be a case of wrong direction of comparison. I would appreciate it if someone thinks about it for a moment before merging.

To post a comment you must log in.
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 3776. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/415148977.
Appveyor build 3575. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1785404_chat_scrolling-3575.

Toni Förster (stonerl) wrote :

Works for me. Tested on macOS 10.13.

review: Approve
GunChleoc (gunchleoc) wrote :

Code LGTM :)

review: Approve
8781. By GunChleoc on 2018-08-13

Merged trunk.

GunChleoc (gunchleoc) wrote :

@bunnybot merge

bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 3786. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/415538286.
Appveyor build 3585. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1785404_chat_scrolling-3585.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/ui_basic/multilinetextarea.cc'
2--- src/ui_basic/multilinetextarea.cc 2018-07-28 07:02:25 +0000
3+++ src/ui_basic/multilinetextarea.cc 2018-08-13 16:00:23 +0000
4@@ -104,7 +104,7 @@
5 scrollbar_.set_steps(height - get_h());
6
7 if (scrollmode_ == ScrollMode::kScrollLog || scrollmode_ == ScrollMode::kScrollLogForced) {
8- if (scrollbar_.get_scrollpos() >= scrollbar_.get_steps() - 1) {
9+ if (scrollbar_.get_scrollpos() < scrollbar_.get_steps() - 1) {
10 scrollbar_.set_scrollpos(height - get_h());
11 }
12 }