[Scummvm-git-logs] scummvm master -> ded2ecc94f90b1538a2d77eb07eed3319742897c
sev-
noreply at scummvm.org
Sun Apr 5 19:17:56 UTC 2026
This automated email contains information about 4 new commits which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
a3a1d8d793 GUI: Move Tooltip method definitions
8f507f51ba GUI: Pass Tooltip events to associated widget, not parent dialog
3f3363ab0e GUI: Handle mouse movement when tooltip is shown
ded2ecc94f JANITORIAL: GUI: Reformat Tooltip
Commit: a3a1d8d793dc2daccd7a303533f3d95436997cfe
https://github.com/scummvm/scummvm/commit/a3a1d8d793dc2daccd7a303533f3d95436997cfe
Author: tunnelsociety (tunnelsociety at mm.st)
Date: 2026-04-05T21:17:50+02:00
Commit Message:
GUI: Move Tooltip method definitions
This header is included more than once in ScummVM
Changed paths:
gui/Tooltip.cpp
gui/Tooltip.h
diff --git a/gui/Tooltip.cpp b/gui/Tooltip.cpp
index 79f0f9db91a..d5a7f72c5da 100644
--- a/gui/Tooltip.cpp
+++ b/gui/Tooltip.cpp
@@ -98,4 +98,33 @@ void Tooltip::drawDialog(DrawLayer layerToDraw) {
}
}
+void Tooltip::handleMouseDown(int x, int y, int button, int clickCount) {
+ close();
+ _parent->handleMouseDown(x + (getAbsX() - _parent->getAbsX()), y + (getAbsY() - _parent->getAbsY()), button, clickCount);
+}
+
+void Tooltip::handleMouseUp(int x, int y, int button, int clickCount) {
+ close();
+ _parent->handleMouseUp(x + (getAbsX() - _parent->getAbsX()), y + (getAbsY() - _parent->getAbsY()), button, clickCount);
+}
+
+void Tooltip::handleMouseWheel(int x, int y, int direction) {
+ close();
+ _parent->handleMouseWheel(x + (getAbsX() - _parent->getAbsX()), y + (getAbsX() - _parent->getAbsX()), direction);
+}
+
+void Tooltip::handleKeyDown(Common::KeyState state) {
+ close();
+ _parent->handleKeyDown(state);
+}
+
+void Tooltip::handleKeyUp(Common::KeyState state) {
+ close();
+ _parent->handleKeyUp(state);
+}
+
+void Tooltip::handleMouseMoved(int x, int y, int button) {
+ close();
+}
+
}
diff --git a/gui/Tooltip.h b/gui/Tooltip.h
index 2f188764ff3..7f87416d02b 100644
--- a/gui/Tooltip.h
+++ b/gui/Tooltip.h
@@ -43,29 +43,12 @@ public:
void receivedFocus(int x = -1, int y = -1) override {}
protected:
- void handleMouseDown(int x, int y, int button, int clickCount) override {
- close();
- _parent->handleMouseDown(x + (getAbsX() - _parent->getAbsX()), y + (getAbsY() - _parent->getAbsY()), button, clickCount);
- }
- void handleMouseUp(int x, int y, int button, int clickCount) override {
- close();
- _parent->handleMouseUp(x + (getAbsX() - _parent->getAbsX()), y + (getAbsY() - _parent->getAbsY()), button, clickCount);
- }
- void handleMouseWheel(int x, int y, int direction) override {
- close();
- _parent->handleMouseWheel(x + (getAbsX() - _parent->getAbsX()), y + (getAbsX() - _parent->getAbsX()), direction);
- }
- void handleKeyDown(Common::KeyState state) override {
- close();
- _parent->handleKeyDown(state);
- }
- void handleKeyUp(Common::KeyState state) override {
- close();
- _parent->handleKeyUp(state);
- }
- void handleMouseMoved(int x, int y, int button) override {
- close();
- }
+ void handleKeyDown(Common::KeyState state) override;
+ void handleKeyUp(Common::KeyState state) override;
+ void handleMouseDown(int x, int y, int button, int clickCount) override;
+ void handleMouseMoved(int x, int y, int button) override;
+ void handleMouseUp(int x, int y, int button, int clickCount) override;
+ void handleMouseWheel(int x, int y, int direction) override;
int _maxWidth;
int _xdelta, _ydelta;
Commit: 8f507f51ba3a4da1d6b259a231515337214c798f
https://github.com/scummvm/scummvm/commit/8f507f51ba3a4da1d6b259a231515337214c798f
Author: tunnelsociety (tunnelsociety at mm.st)
Date: 2026-04-05T21:17:50+02:00
Commit Message:
GUI: Pass Tooltip events to associated widget, not parent dialog
Changed paths:
gui/Tooltip.cpp
gui/Tooltip.h
diff --git a/gui/Tooltip.cpp b/gui/Tooltip.cpp
index d5a7f72c5da..10b7f44f143 100644
--- a/gui/Tooltip.cpp
+++ b/gui/Tooltip.cpp
@@ -31,7 +31,7 @@ namespace GUI {
Tooltip::Tooltip() :
- Dialog(-1, -1, -1, -1), _maxWidth(-1), _parent(nullptr), _xdelta(0), _ydelta(0), _xpadding(0), _ypadding(0) {
+ Dialog(-1, -1, -1, -1), _maxWidth(-1), _widget(nullptr), _xdelta(0), _ydelta(0), _xpadding(0), _ypadding(0) {
_backgroundType = GUI::ThemeEngine::kDialogBackgroundTooltip;
}
@@ -39,7 +39,7 @@ Tooltip::Tooltip() :
void Tooltip::setup(Dialog *parent, Widget *widget, int x, int y) {
assert(widget->hasTooltip());
- _parent = parent;
+ _widget = widget;
setMouseUpdatedOnFocus(false);
@@ -100,27 +100,27 @@ void Tooltip::drawDialog(DrawLayer layerToDraw) {
void Tooltip::handleMouseDown(int x, int y, int button, int clickCount) {
close();
- _parent->handleMouseDown(x + (getAbsX() - _parent->getAbsX()), y + (getAbsY() - _parent->getAbsY()), button, clickCount);
+ _widget->handleMouseDown(x + (getAbsX() - _widget->getAbsX()), y + (getAbsY() - _widget->getAbsY()), button, clickCount);
}
void Tooltip::handleMouseUp(int x, int y, int button, int clickCount) {
close();
- _parent->handleMouseUp(x + (getAbsX() - _parent->getAbsX()), y + (getAbsY() - _parent->getAbsY()), button, clickCount);
+ _widget->handleMouseUp(x + (getAbsX() - _widget->getAbsX()), y + (getAbsY() - _widget->getAbsY()), button, clickCount);
}
void Tooltip::handleMouseWheel(int x, int y, int direction) {
close();
- _parent->handleMouseWheel(x + (getAbsX() - _parent->getAbsX()), y + (getAbsX() - _parent->getAbsX()), direction);
+ _widget->handleMouseWheel(x + (getAbsX() - _widget->getAbsX()), y + (getAbsX() - _widget->getAbsX()), direction);
}
void Tooltip::handleKeyDown(Common::KeyState state) {
close();
- _parent->handleKeyDown(state);
+ _widget->handleKeyDown(state);
}
void Tooltip::handleKeyUp(Common::KeyState state) {
close();
- _parent->handleKeyUp(state);
+ _widget->handleKeyUp(state);
}
void Tooltip::handleMouseMoved(int x, int y, int button) {
diff --git a/gui/Tooltip.h b/gui/Tooltip.h
index 7f87416d02b..637dc00c927 100644
--- a/gui/Tooltip.h
+++ b/gui/Tooltip.h
@@ -32,7 +32,7 @@ class Widget;
class Tooltip : public Dialog {
private:
- Dialog *_parent;
+ Widget *_widget;
public:
Tooltip();
Commit: 3f3363ab0edbdf390e2fd39cdc94a3627bedc1c4
https://github.com/scummvm/scummvm/commit/3f3363ab0edbdf390e2fd39cdc94a3627bedc1c4
Author: tunnelsociety (tunnelsociety at mm.st)
Date: 2026-04-05T21:17:50+02:00
Commit Message:
GUI: Handle mouse movement when tooltip is shown
Changed paths:
gui/Tooltip.cpp
diff --git a/gui/Tooltip.cpp b/gui/Tooltip.cpp
index 10b7f44f143..63a434a128c 100644
--- a/gui/Tooltip.cpp
+++ b/gui/Tooltip.cpp
@@ -125,6 +125,7 @@ void Tooltip::handleKeyUp(Common::KeyState state) {
void Tooltip::handleMouseMoved(int x, int y, int button) {
close();
+ _widget->handleMouseMoved(x, y, button);
}
}
Commit: ded2ecc94f90b1538a2d77eb07eed3319742897c
https://github.com/scummvm/scummvm/commit/ded2ecc94f90b1538a2d77eb07eed3319742897c
Author: tunnelsociety (tunnelsociety at mm.st)
Date: 2026-04-05T21:17:50+02:00
Commit Message:
JANITORIAL: GUI: Reformat Tooltip
Changed paths:
gui/Tooltip.cpp
gui/Tooltip.h
diff --git a/gui/Tooltip.cpp b/gui/Tooltip.cpp
index 63a434a128c..ed81d7665b1 100644
--- a/gui/Tooltip.cpp
+++ b/gui/Tooltip.cpp
@@ -23,16 +23,13 @@
#include "gui/widget.h"
#include "gui/dialog.h"
#include "gui/gui-manager.h"
-
#include "gui/Tooltip.h"
#include "gui/ThemeEval.h"
namespace GUI {
-
Tooltip::Tooltip() :
Dialog(-1, -1, -1, -1), _maxWidth(-1), _widget(nullptr), _xdelta(0), _ydelta(0), _xpadding(0), _ypadding(0) {
-
_backgroundType = GUI::ThemeEngine::kDialogBackgroundTooltip;
}
@@ -128,4 +125,4 @@ void Tooltip::handleMouseMoved(int x, int y, int button) {
_widget->handleMouseMoved(x, y, button);
}
-}
+} // End of namespace GUI
diff --git a/gui/Tooltip.h b/gui/Tooltip.h
index 637dc00c927..f3e9e9950a7 100644
--- a/gui/Tooltip.h
+++ b/gui/Tooltip.h
@@ -36,12 +36,10 @@ private:
public:
Tooltip();
-
void setup(Dialog *parent, Widget *widget, int x, int y);
-
void drawDialog(DrawLayer layerToDraw) override;
-
void receivedFocus(int x = -1, int y = -1) override {}
+
protected:
void handleKeyDown(Common::KeyState state) override;
void handleKeyUp(Common::KeyState state) override;
More information about the Scummvm-git-logs
mailing list