From 7ea595b6a463aeb0ef30440efe762c336d50e0c6 Mon Sep 17 00:00:00 2001 From: Michael Bonani Date: Mon, 20 Dec 2021 19:14:52 +0100 Subject: [PATCH] fix gui for high density in WIN and button in ThymioSelectionView.qml (#971) --- CMakeLists.txt | 5 +++-- aseba/launcher/src/qml/ThymioSelectionView.qml | 2 +- .../src/qml/remoteconnection/RemoteConnectionDialog.qml | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4f6346836..d88ec8579 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -125,8 +125,9 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}/bin") cmake_policy(SET CMP0020 NEW) if(CREATE_QT_CONF_FILE) - #create an empty qt.conf file - file(WRITE ${CMAKE_BINARY_DIR}/bin/qt.conf "") + #create an qt.conf file + file(WRITE ${CMAKE_BINARY_DIR}/bin/qt.conf "[Platforms] + WindowsArguments = dpiawareness=0") install(FILES ${CMAKE_BINARY_DIR}/bin/qt.conf DESTINATION bin) endif() diff --git a/aseba/launcher/src/qml/ThymioSelectionView.qml b/aseba/launcher/src/qml/ThymioSelectionView.qml index 264f15205..d3f8fcfe5 100644 --- a/aseba/launcher/src/qml/ThymioSelectionView.qml +++ b/aseba/launcher/src/qml/ThymioSelectionView.qml @@ -1,7 +1,7 @@ import QtQuick 2.12 import QtQuick.Controls 2.12 import QtQuick.Layouts 1.12 -//import org.mobsya 1.0 +import org.mobsya 1.0 Item { id:selection_view diff --git a/aseba/launcher/src/qml/remoteconnection/RemoteConnectionDialog.qml b/aseba/launcher/src/qml/remoteconnection/RemoteConnectionDialog.qml index 70ed3cff6..7e758850c 100644 --- a/aseba/launcher/src/qml/remoteconnection/RemoteConnectionDialog.qml +++ b/aseba/launcher/src/qml/remoteconnection/RemoteConnectionDialog.qml @@ -36,8 +36,8 @@ Rectangle { function fontsize(){ if(remoteConnection.height>=800) - return 15; - return 13; + return 14; + return 12; }