mirror/86Box
1
0
Fork 0
mirror of https://github.com/86Box/86Box.git synced 2026-02-23 09:58:19 -07:00
Code Issues Packages Projects Releases Activity

Merge remote-tracking branch 'upstream/master' into feature/ich2

Browse Source
This commit is contained in:
Jasmine Iwanek
2023-06-27 10:21:58 -04:00
parent 8febf96669 b3bd55da17
commit 0c93d126fd
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.ci/AppImageBuilder.yml
View File

@@ -60,7 +60,6 @@ AppDir:
- libslirp0 # if SLIRP_EXTERNAL:BOOL=ON
- libsndio7.0 # if OPENAL:BOOL=ON
- libvdeplug-dev # -dev also pulls in libvdeplug2. -dev is required to get the proper .so symlink to the library
- libwayland-client0 # if QT:BOOL=ON
- libx11-6 # if QT:BOOL=ON
- libx11-xcb1 # if QT:BOOL=ON
- libxcb1 # if QT:BOOL=ON

12
src/qt/qt_mainwindow.cpp
View File

@@ -942,11 +942,13 @@ MainWindow::processKeyboardInput(bool down, uint32_t keycode)
}
break;
case 0x80 ... 0xff: /* regular break codes */
case 0x10b: /* Microsoft scroll up normal */
case 0x18b: /* Microsoft scroll down normal */
/* This abuses make/break codes. Send them manually, only on press. */
case 0x180 ... 0x1ff: /* E0 break codes (including Microsoft scroll down normal) */
/* This key uses a break code as make. Send it manually, only on press. */
if (down) {
keyboard_send(0xe0);
if (keycode & 0x100)
keyboard_send(0xe0);
keyboard_send(keycode & 0xff);
}
return;
@@ -1282,12 +1284,12 @@ MainWindow::keyReleaseEvent(QKeyEvent *event)
}
}
if (fs_off_signal && (video_fullscreen > 0) && keyboard_isfsexit_down()) {
if (fs_off_signal && (video_fullscreen > 0) && keyboard_isfsexit()) {
ui->actionFullscreen->trigger();
fs_off_signal = false;
}
if (fs_on_signal && (video_fullscreen == 0) && keyboard_isfsenter_down()) {
if (fs_on_signal && (video_fullscreen == 0) && keyboard_isfsenter()) {
ui->actionFullscreen->trigger();
fs_on_signal = false;
}