piwalker/melonDS
1
0
Fork 0
mirror of https://github.com/melonDS-emu/melonDS.git synced 2025-07-27 00:00:07 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix Ubuntu

Browse Source
This commit is contained in:
RSDuck
2022-10-13 01:25:47 +02:00
parent 5c6bf5fcf7
commit 1edbc800be
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build-ubuntu-aarch64.yml vendored
View File

@ -33,7 +33,7 @@ jobs:
rm /etc/apt/sources.list rm /etc/apt/sources.list
mv /etc/apt/sources.list{.new,} mv /etc/apt/sources.list{.new,}
apt update apt update
DEBIAN_FRONTEND=noninteractive apt install -y {gcc-10,g++-10,pkg-config}-aarch64-linux-gnu {libsdl2,qtbase5,qtbase5-private-dev,qtmultimedia5,libslirp,libarchive}-dev:arm64 cmake extra-cmake-modules dpkg-dev DEBIAN_FRONTEND=noninteractive apt install -y {gcc-10,g++-10,pkg-config}-aarch64-linux-gnu {libsdl2,qtbase5,qtbase5-private,qtmultimedia5,libslirp,libarchive}-dev:arm64 cmake extra-cmake-modules dpkg-dev
- name: Configure - name: Configure
shell: bash shell: bash
run: | run: |

6
src/frontend/qt_sdl/main.cpp
View File

@ -1278,11 +1278,11 @@ bool ScreenPanelGL::createContext()
qreal ScreenPanelGL::devicePixelRatioFromScreen() const qreal ScreenPanelGL::devicePixelRatioFromScreen() const
{ {
const QScreen* screen_for_ratio = screen(); const QScreen* screen_for_ratio = window()->windowHandle()->screen();
if (!screen_for_ratio) if (!screen_for_ratio)
screen_for_ratio = QGuiApplication::primaryScreen(); screen_for_ratio = QGuiApplication::primaryScreen();
return screen_for_ratio ? screen_for_ratio->devicePixelRatio() : static_cast<qreal>(1); return screen_for_ratio ? screen_for_ratio->devicePixelRatio() : static_cast<qreal>(1);
} }
int ScreenPanelGL::scaledWindowWidth() const int ScreenPanelGL::scaledWindowWidth() const