mirror of
https://github.com/overte-org/overte.git
synced 2025-08-06 11:41:17 +02:00
maybe a fix for windows scaling
This commit is contained in:
parent
3debfb95b0
commit
f4f634f67b
3 changed files with 5 additions and 1 deletions
|
@ -33,6 +33,8 @@ Launcher::Launcher(int& argc, char**argv) : QGuiApplication(argc, argv) {
|
||||||
QFontDatabase::addApplicationFont(PathUtils::fontPath("Graphik-Semibold.ttf"));
|
QFontDatabase::addApplicationFont(PathUtils::fontPath("Graphik-Semibold.ttf"));
|
||||||
|
|
||||||
_launcherWindow->setSource(QUrl(PathUtils::resourcePath("qml/root.qml")));
|
_launcherWindow->setSource(QUrl(PathUtils::resourcePath("qml/root.qml")));
|
||||||
|
_launcherWindow->setHeight(540);
|
||||||
|
_launcherWindow->setWidth(627);
|
||||||
_launcherWindow->setResizeMode(QQuickView::SizeRootObjectToView);
|
_launcherWindow->setResizeMode(QQuickView::SizeRootObjectToView);
|
||||||
_launcherWindow->show();
|
_launcherWindow->show();
|
||||||
}
|
}
|
||||||
|
|
|
@ -673,6 +673,8 @@ void LauncherState::contentCacheDownloadComplete() {
|
||||||
if (reply->error()) {
|
if (reply->error()) {
|
||||||
qDebug() << "Error downloading content cache: " << reply->error() << reply->readAll();
|
qDebug() << "Error downloading content cache: " << reply->error() << reply->readAll();
|
||||||
qDebug() << "Continuing to launch client";
|
qDebug() << "Continuing to launch client";
|
||||||
|
_contentDownloadProgress = 100.0f;
|
||||||
|
_contentInstallProgress = 100.0f;
|
||||||
launchClient();
|
launchClient();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
|
@ -49,7 +49,7 @@ int main(int argc, char *argv[]) {
|
||||||
if (argc == 3) {
|
if (argc == 3) {
|
||||||
if (hasSuffix(argv[1], "app") && hasSuffix(argv[2], "app")) {
|
if (hasSuffix(argv[1], "app") && hasSuffix(argv[2], "app")) {
|
||||||
bool success = swapLaunchers(argv[1], argv[2]);
|
bool success = swapLaunchers(argv[1], argv[2]);
|
||||||
qDebug() << "Launcher install success: " << success;
|
qDebug() << "Successfully installed Launcher: " << success;
|
||||||
if (!success) {
|
if (!success) {
|
||||||
options->append("--noUpdate");
|
options->append("--noUpdate");
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue