joncampbell123/dosbox-x
1
0
Fork 0
mirror of https://github.com/joncampbell123/dosbox-x.git synced 2025-10-14 02:17:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
Jonathan Campbell
2021-07-23 01:17:59 -07:00
parent c76d76cb15 ffb1606d39
commit fbb7e886c4
3 changed files with 3750 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3721
contrib/translations/fr/fr_FR.lng Normal file
View File

File diff suppressed because it is too large Load Diff

40
src/libs/gui_tk/gui_tk.cpp
View File

@@ -2082,22 +2082,34 @@ bool ScreenSDL::event(SDL_Event &event) {
if (key.special == GUI::Key::CapsLock || key.special == GUI::Key::NumLock) keyUp(key);
return rc;
}
case SDL_MOUSEMOTION:
if (event.motion.state) {
if (abs(event.motion.x-downx) <= 10 && abs(event.motion.y-downy) <= 10)
break;
downx = -11; downy = -11;
if (event.motion.state&SDL_BUTTON(1))
return mouseDragged(event.motion.x, event.motion.y, GUI::Left);
else if (event.motion.state&SDL_BUTTON(2))
return mouseDragged(event.motion.x, event.motion.y, GUI::Middle);
else if (event.motion.state&SDL_BUTTON(3))
return mouseDragged(event.motion.x, event.motion.y, GUI::Right);
break;
}
case SDL_MOUSEMOTION:
{
const auto m = event.motion;
const auto x = m.x / scale;
const auto y = m.y / scale;
return mouseMoved(event.motion.x, event.motion.y);
if (m.state)
{
if(abs(x - downx) <= 10 && abs(y - downy) <= 10)
break;
downx = -11;
downy = -11;
if(m.state & SDL_BUTTON(1))
return mouseDragged(x, y, Left);
if(m.state & SDL_BUTTON(2))
return mouseDragged(x, y, Middle);
if(m.state & SDL_BUTTON(3))
return mouseDragged(x, y, Right);
break;
}
return mouseMoved(x, y);
}
case SDL_MOUSEBUTTONDOWN:
event.button.x /= scale; event.button.y /= scale;
rc = mouseDown(event.button.x, event.button.y, SDL_to_GUI(event.button.button));

3
src/libs/gui_tk/gui_tk.h
View File

@@ -2082,6 +2082,9 @@ protected:
selected++;
}
if (selected > items.size() - 1)
selected = items.size() - 1;
if (selected >= 0 && items[(unsigned int)selected].size() == 0) selected = -1;
}