MattTheTekie/devilutionX
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Consistently trigger menu/movie transitions on mouse up instead of down

Browse source 
Keypresses still occur on keydown to allow for repetition (e.g. when scrolling)
This commit is contained in:
ephphatha 2021-12-28 12:40:53 +11:00 • committed by Anders Jenbo
commit 1abc617e1a
4 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Source/DiabloUI/credits.cpp
View file

@ -142,7 +142,7 @@ bool TextDialog(char const *const *text, std::size_t textLines)
while (PollEvent(&event) != 0) {
switch (event.type) {
case SDL_KEYDOWN:
case SDL_MOUSEBUTTONDOWN:
case SDL_MOUSEBUTTONUP:
endMenu = true;
break;
default:

2
Source/DiabloUI/diabloui.cpp
View file

@ -907,7 +907,7 @@ void RenderItem(UiItemBase *item)
bool HandleMouseEventArtTextButton(const SDL_Event &event, const UiArtTextButton *uiButton)
{
if (event.type != SDL_MOUSEBUTTONDOWN || event.button.button != SDL_BUTTON_LEFT) {
if (event.type != SDL_MOUSEBUTTONUP || event.button.button != SDL_BUTTON_LEFT) {
return false;
}

2
Source/DiabloUI/title.cpp
View file

@ -64,7 +64,7 @@ void UiTitleDialog()
}
switch (event.type) {
case SDL_KEYDOWN:
case SDL_MOUSEBUTTONDOWN:
case SDL_MOUSEBUTTONUP:
endMenu = true;
break;
}

4
Source/movie.cpp
View file

@ -40,8 +40,8 @@ void play_movie(const char *pszMovie, bool userCanClose)
while (movie_playing && FetchMessage(&msg)) {
switch (msg.message) {
case DVL_WM_KEYDOWN:
case DVL_WM_LBUTTONDOWN:
case DVL_WM_RBUTTONDOWN:
case DVL_WM_LBUTTONUP:
case DVL_WM_RBUTTONUP:
if (userCanClose || (msg.message == DVL_WM_KEYDOWN && msg.wParam == DVL_VK_ESCAPE))
movie_playing = false;
break;