[Scummvm-cvs-logs] scummvm master -> 499e5ab3ea5b4528215f53b21a92d9ec8734a7a5

sev- sev at scummvm.org
Fri Jul 22 13:36:00 CEST 2016


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

Summary:
499e5ab3ea GUI: Fix regression in multicolumn PopUp widget


Commit: 499e5ab3ea5b4528215f53b21a92d9ec8734a7a5
    https://github.com/scummvm/scummvm/commit/499e5ab3ea5b4528215f53b21a92d9ec8734a7a5
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-07-22T14:36:00+03:00

Commit Message:
GUI: Fix regression in multicolumn PopUp widget

Changed paths:
    gui/widgets/popup.cpp



diff --git a/gui/widgets/popup.cpp b/gui/widgets/popup.cpp
index 789064e..82f4112 100644
--- a/gui/widgets/popup.cpp
+++ b/gui/widgets/popup.cpp
@@ -71,6 +71,10 @@ PopUpDialog::PopUpDialog(PopUpWidget *boss, int clickX, int clickY)
 	: Dialog(0, 0, 16, 16),
 	_popUpBoss(boss) {
 
+	_openTime = 0;
+	_buffer = nullptr;
+	_entriesPerColumn = 1;
+
 	// Copy the selection index
 	_selection = _popUpBoss->_selectedItem;
 
@@ -142,10 +146,6 @@ PopUpDialog::PopUpDialog(PopUpWidget *boss, int clickX, int clickY)
 	// Remember original mouse position
 	_clickX = clickX - _x;
 	_clickY = clickY - _y;
-
-	_openTime = 0;
-	_buffer = nullptr;
-	_entriesPerColumn = 1;
 }
 
 void PopUpDialog::drawDialog() {






More information about the Scummvm-git-logs mailing list