[Scummvm-git-logs] scummvm master -> 4c092c26ba64eecbdefbf6ec708fca8ba21b021f

[bluegr]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
277de28b3e GUI: GridWidget: Update scroll bar position early in sortGroups()
4c092c26ba GUI: GridWidget: Remove redundant scroll bar update


Commit: 277de28b3ef317192c05ed258bfbd0661d96dbb7
    https://github.com/scummvm/scummvm/commit/277de28b3ef317192c05ed258bfbd0661d96dbb7
Author: PushmePullyu (127053144+PushmePullyu at users.noreply.github.com)
Date: 2023-09-03T21:39:01+03:00

Commit Message:
GUI: GridWidget: Update scroll bar position early in sortGroups()

Propagate changes in GridWidget::_scrollPos to
ScrollBarWidget::_currentPos before calling
ScrollBarWidget::checkBounds().

Fixes #14551

Changed paths:
    gui/widgets/grid.cpp


diff --git a/gui/widgets/grid.cpp b/gui/widgets/grid.cpp
index 90f6f60b060..9396b5bc0d0 100644
--- a/gui/widgets/grid.cpp
+++ b/gui/widgets/grid.cpp
@@ -599,6 +599,7 @@ void GridWidget::sortGroups() {
 	calcInnerHeight();
 	markGridAsInvalid();
 
+	_scrollBar->_currentPos = _scrollPos;
 	_scrollBar->checkBounds(_scrollBar->_currentPos);
 	_scrollPos = _scrollBar->_currentPos;
 


Commit: 4c092c26ba64eecbdefbf6ec708fca8ba21b021f
    https://github.com/scummvm/scummvm/commit/4c092c26ba64eecbdefbf6ec708fca8ba21b021f
Author: PushmePullyu (127053144+PushmePullyu at users.noreply.github.com)
Date: 2023-09-03T21:39:01+03:00

Commit Message:
GUI: GridWidget: Remove redundant scroll bar update

sortGroups(): Move the call to scrollBarRecalc() up and delete
superfluous code so the scroll bar is only updated once.

Changed paths:
    gui/widgets/grid.cpp


diff --git a/gui/widgets/grid.cpp b/gui/widgets/grid.cpp
index 9396b5bc0d0..e45beb9f328 100644
--- a/gui/widgets/grid.cpp
+++ b/gui/widgets/grid.cpp
@@ -599,16 +599,13 @@ void GridWidget::sortGroups() {
 	calcInnerHeight();
 	markGridAsInvalid();
 
-	_scrollBar->_currentPos = _scrollPos;
-	_scrollBar->checkBounds(_scrollBar->_currentPos);
-	_scrollPos = _scrollBar->_currentPos;
+	scrollBarRecalc();
 
 	if (calcVisibleEntries()) {
 		reloadThumbnails();
 	}
 
 	assignEntriesToItems();
-	scrollBarRecalc();
 	// FIXME: Temporary solution to clear/display the background ofthe scrollbar when list
 	// grows too small or large during group toggle. We shouldn't have to redraw the top dialog,
 	// but not doing so the background of scrollbar isn't cleared.