Emulation/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2024-05-31 18:27:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

Revert "GUI: Don't enforce full redraw upon closing tool tip"

Browse source 
Unfortunately, it is not that simple. Tooltip may be placed also outside
of the dialog. Current implementation leaves tooltip leftovers over
the dialog below the topmost one, so reverting until I find a correct
way to achieve the goal.

This reverts commit 19b7b2aa20.
This commit is contained in:
Miro Kropacek 2023-05-01 03:33:35 +02:00
parent b8881955de
commit 915dce50ea
4 changed files with 5 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
gui/Tooltip.cpp
View file

@ -97,19 +97,4 @@ void Tooltip::drawDialog(DrawLayer layerToDraw) {
}
}
void Tooltip::close() {
// copy&paste from Dialog::close()
_visible = false;
if (_mouseWidget) {
_mouseWidget->handleMouseLeft(0);
_mouseWidget = nullptr;
}
releaseFocus();
g_gui.closeTopDialog(false);
// instead of kRedrawCloseDialog schedule kRedrawTopDialog of the parent
g_gui.scheduleTopDialogRedraw();
}
}

2
gui/Tooltip.h
View file

@ -43,8 +43,6 @@ public:
void receivedFocus(int x = -1, int y = -1) override {}
protected:
void close() override;
void handleMouseDown(int x, int y, int button, int clickCount) override {
close();
_parent->handleMouseDown(x + (getAbsX() - _parent->getAbsX()), y + (getAbsY() - _parent->getAbsY()), button, clickCount);

10
gui/gui-manager.cpp
View file

@ -614,7 +614,7 @@ void GuiManager::openDialog(Dialog *dialog) {
dialog->reflowLayout();
}
void GuiManager::closeTopDialog(bool redraw) {
void GuiManager::closeTopDialog() {
// Don't do anything if no dialog is open
if (_dialogStack.empty())
return;
@ -627,12 +627,10 @@ void GuiManager::closeTopDialog(bool redraw) {
giveFocusToDialog(dialog);
}
if (redraw) {
if (_redrawStatus != kRedrawFull)
_redrawStatus = kRedrawCloseDialog;
if (_redrawStatus != kRedrawFull)
_redrawStatus = kRedrawCloseDialog;
this->redraw();
}
redraw();
}
void GuiManager::setupCursor() {

3
gui/gui-manager.h
View file

@ -71,7 +71,6 @@ typedef Common::FixedStack<Dialog *> DialogStack;
*/
class GuiManager : public Common::Singleton<GuiManager>, public CommandSender {
friend class Dialog;
friend class Tooltip;
friend class Common::Singleton<SingletonBaseType>;
GuiManager();
~GuiManager() override;
@ -212,7 +211,7 @@ protected:
void restoreState();
void openDialog(Dialog *dialog);
void closeTopDialog(bool redraw = true);
void closeTopDialog();
void redraw();