Skip to content

Commit

Permalink
Reverting temporary changes forcing VKB enablement on desktop.
Browse files Browse the repository at this point in the history
  • Loading branch information
MikeTrahearn-Qinetic committed Dec 11, 2024
1 parent ea10f91 commit 84aaf67
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 12 deletions.
19 changes: 9 additions & 10 deletions ApplicationContent.qml
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,10 @@ Item {
if (_initialized) { // Only show the notification when the value changes, not when the application is loaded
Global.showToastNotification(VenusOS.Notification_Info,
(value ?
//% "Touch input on"
qsTrId("application_content_touch_input_on") :
//% "Touch input off"
qsTrId("application_content_touch_input_off")),
//% "Touch input on"
qsTrId("application_content_touch_input_on") :
//% "Touch input off"
qsTrId("application_content_touch_input_off")),
3000)
}
_initialized = true
Expand Down Expand Up @@ -151,12 +151,11 @@ Item {
id: keyboardHandlerLoader

asynchronous: true
source: "qrc:/qt/qml/Victron/VenusOS/components/InputPanel.qml"
// active: Global.isGxDevice
// || (BackendConnection.needsWasmKeyboardHandler && Global.main.width > Global.main.height)
// source: Global.isGxDevice
// ? "qrc:/qt/qml/Victron/VenusOS/components/InputPanel.qml"
// : "qrc:/qt/qml/Victron/VenusOS/components/WasmVirtualKeyboardHandler.qml"
active: Global.isGxDevice
|| (BackendConnection.needsWasmKeyboardHandler && Global.main.width > Global.main.height)
source: Global.isGxDevice
? "qrc:/qt/qml/Victron/VenusOS/components/InputPanel.qml"
: "qrc:/qt/qml/Victron/VenusOS/components/WasmVirtualKeyboardHandler.qml"
parent: QtQuickControls.Overlay.overlay
z: 1
}
Expand Down
4 changes: 2 additions & 2 deletions src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -271,12 +271,12 @@ int main(int argc, char *argv[])
{
qInfo().nospace() << "Victron gui version: v" << PROJECT_VERSION_MAJOR << "." << PROJECT_VERSION_MINOR << "." << PROJECT_VERSION_PATCH;

//#if !defined(VENUS_WEBASSEMBLY_BUILD) && !defined(VENUS_DESKTOP_BUILD)
#if !defined(VENUS_WEBASSEMBLY_BUILD) && !defined(VENUS_DESKTOP_BUILD)
// The qt vkb behaves in an annoying manner in qt6.5.2 wasm builds (but not other versions).
// It pops up every time you tap the screen, making landscape mode unusable.
// The native vkb gets used instead, so a keyboard is still available when required.
qputenv("QT_IM_MODULE", QByteArray("qtvirtualkeyboard"));
//#endif
#endif

qreal scaleFactor = 1.0;

Expand Down

0 comments on commit 84aaf67

Please sign in to comment.