thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Renamed _clickedWidget -> _dragWidget; if a drag is in process, send the mouse moved / mouse up events to the widget on which the drag is performed (this fixes at least one bug and improves the user experience)

Browse source 
svn-id: r16362
This commit is contained in:
Max Horn 2004-12-28 21:07:34 +00:00
parent 8e42cbde2a
commit a40ed29abd
3 changed files with 14 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

25
gui/dialog.cpp
View file

@ -38,7 +38,7 @@ namespace GUI {
Dialog::Dialog(int x, int y, int w, int h) Dialog::Dialog(int x, int y, int w, int h)
: GuiObject(x, y, w, h), : GuiObject(x, y, w, h),
_mouseWidget(0), _focusedWidget(0), _clickedWidget(0), _visible(false) { _mouseWidget(0), _focusedWidget(0), _dragWidget(0), _visible(false) {
} }
Dialog::~Dialog() { Dialog::~Dialog() {
@ -120,7 +120,7 @@ void Dialog::handleMouseDown(int x, int y, int button, int clickCount) {
Widget *w; Widget *w;
w = findWidget(x, y); w = findWidget(x, y);
_clickedWidget = w; _dragWidget = w;
// If the click occured inside a widget which is not the currently // If the click occured inside a widget which is not the currently
// focused one, change the focus to that widget. // focused one, change the focus to that widget.
@ -143,8 +143,6 @@ void Dialog::handleMouseDown(int x, int y, int button, int clickCount) {
void Dialog::handleMouseUp(int x, int y, int button, int clickCount) { void Dialog::handleMouseUp(int x, int y, int button, int clickCount) {
Widget *w; Widget *w;
w = findWidget(x, y);
if (_focusedWidget) { if (_focusedWidget) {
//w = _focusedWidget; //w = _focusedWidget;
@ -154,10 +152,12 @@ void Dialog::handleMouseUp(int x, int y, int button, int clickCount) {
} }
} }
if (w && w == _clickedWidget) w = _dragWidget;
if (w)
w->handleMouseUp(x - (w->getAbsX() - _x), y - (w->getAbsY() - _y), button, clickCount); w->handleMouseUp(x - (w->getAbsX() - _x), y - (w->getAbsY() - _y), button, clickCount);
_clickedWidget = 0; _dragWidget = 0;
} }
void Dialog::handleMouseWheel(int x, int y, int direction) { void Dialog::handleMouseWheel(int x, int y, int direction) {
@ -215,9 +215,9 @@ void Dialog::handleMouseMoved(int x, int y, int button) {
Widget *w; Widget *w;
//if (!button) //if (!button)
// _clickedWidget = 0; // _dragWidget = 0;
if (_focusedWidget && !_clickedWidget) { if (_focusedWidget && !_dragWidget) {
w = _focusedWidget; w = _focusedWidget;
int wx = w->getAbsX() - _x; int wx = w->getAbsX() - _x;
int wy = w->getAbsY() - _y; int wy = w->getAbsY() - _y;
@ -238,13 +238,12 @@ void Dialog::handleMouseMoved(int x, int y, int button) {
w->handleMouseMoved(x - wx, y - wy, button); w->handleMouseMoved(x - wx, y - wy, button);
} }
w = findWidget(x, y);
// While a "drag" is in process (i.e. mouse is moved while a button is pressed), // While a "drag" is in process (i.e. mouse is moved while a button is pressed),
// only deal with the widget in which the click originated. // only deal with the widget in which the click originated.
if (_clickedWidget && w != _clickedWidget) { if (_dragWidget)
w = 0; w = _dragWidget;
} else
w = findWidget(x, y);
if (_mouseWidget != w) { if (_mouseWidget != w) {
if (_mouseWidget) if (_mouseWidget)

2
gui/dialog.h
View file

@ -41,7 +41,7 @@ class Dialog : public GuiObject {
protected: protected:
Widget *_mouseWidget; Widget *_mouseWidget;
Widget *_focusedWidget; Widget *_focusedWidget;
Widget *_clickedWidget; Widget *_dragWidget;
bool _visible; bool _visible;
private: private:

2
gui/widget.cpp
View file

@ -208,8 +208,6 @@ SliderWidget::SliderWidget(GuiObject *boss, int x, int y, int w, int h, const St
} }
void SliderWidget::handleMouseMoved(int x, int y, int button) { void SliderWidget::handleMouseMoved(int x, int y, int button) {
// TODO: when the mouse is dragged outside the widget, the slider should
// snap back to the old value.
if (isEnabled() && _isDragging && x >= (int)_labelWidth) { if (isEnabled() && _isDragging && x >= (int)_labelWidth) {
int newValue = posToValue(x - _labelWidth); int newValue = posToValue(x - _labelWidth);
if (newValue < _valueMin) if (newValue < _valueMin)