Upgrade to > Qt5.15 -6 and ImGUI > v1.87 + fixes keyboard and mouse handling & widget samples #44
Conversation
Add specific key mapping function per OS platform
Add a ImGui::InputTextWithHint control to test keyboard.
moezb
changed the title
…I v1.87 This also fixes a couple of problems with mouse clik/double click.
|
|
||
| # We're using qt versionless targets so our minimal Qt version is 5.15, we support Qt6 as well | ||
| # See https://www.qt.io/blog/versionless-cmake-targets-qt-5.15 | ||
| find_package(Qt6 COMPONENTS COMPONENTS Core Quick Gui Widgets OpenGLWidgets ) |
There was a problem hiding this comment.
Extra space before the parenthesis and before "Core".
| endif() | ||
| endif() | ||
|
|
||
| message(STATUS Qt ${QT_DEFAULT_MAJOR_VERSION}) |
There was a problem hiding this comment.
This message should be a bit clearer to the user. Like "Compiling with Qt X". I saw it, and was just a bit puzzled.
| @@ -21,7 +32,10 @@ target_link_libraries( | |||
| qt_imgui_quick | |||
| PUBLIC | |||
| imgui | |||
| Qt5::Gui | |||
| Qt::Gui | |||
| # We use the new Qt Rendering Hardware Interface (RHI) when buzilding with Qt and thgus we need openglwidgets qt module | |||
There was a problem hiding this comment.
s/buzilding with Qt and thgus/building with Qt and thus/
| @@ -34,7 +48,10 @@ target_link_libraries( | |||
| qt_imgui_widgets | |||
| PUBLIC | |||
| imgui | |||
| Qt5::Widgets | |||
| Qt::Widgets | |||
| # We use the new Qt Rendering Hardware Interface (RHI) when buzilding with Qt and thgus we need openglwidgets qt module | |||
| #endif | ||
|
|
||
| #ifdef Q_OS_LINUX | ||
| #include "platform/linux_key_mappings.cpp" |
There was a problem hiding this comment.
The one for linux is entirely empty. Is there a recipe one can follow to make the mappings? I checked the backend directory on ImGui, but I was expecting something like X11/Wayland, and that doesn't seem to be the case.
|
|
||
| DemoWidget *widget=new DemoWidget(); | ||
| widget->setWindowTitle("QtImGui widget example"); | ||
| QWidget* window=new QWidget(); |
There was a problem hiding this comment.
I don't think this should be heap allocated. It seems to be leaking right now.
|
|
||
| switch (event->type()) { | ||
| case QEvent::MouseMove: | ||
| onMouseMove(dynamic_cast<QMouseEvent*>(event)); |
There was a problem hiding this comment.
This cast, and all of the above, can be static_cast.
| case QMouseEvent::Leave: | ||
| onMouseLeave(); | ||
| break; | ||
| case QEvent::MouseButtonDblClick: case QEvent::MouseButtonPress: |
There was a problem hiding this comment.
Probably split the line, so there is one case per line.
|
The PR doesn't compile yet on Qt 5 and/or Linux. I'll see if I can provide a linux implementation for the key mapping. For the compile errors on Qt 5, I needed to apply this changes: diff --git i/src/ImGuiRenderer.cpp w/src/ImGuiRenderer.cpp
index da7c76f..306e088 100644
--- i/src/ImGuiRenderer.cpp
+++ w/src/ImGuiRenderer.cpp
@@ -5,7 +5,7 @@
#include <QMouseEvent>
#include <QClipboard>
#include <QCursor>
-#include <QWidget>
+#include <QDebug>
#ifdef ANDROID
@@ -347,7 +347,7 @@ void ImGuiRenderer::onMouseMove(QMouseEvent* event) {
assert(event != nullptr);
ImGuiIO& io = ImGui::GetIO();
if (!MouseTracked) MouseTracked = true;
- MousePos = ImVec2(static_cast<float>(event->position().x()), static_cast<float>(event->position().y()));
+ MousePos = ImVec2(static_cast<float>(event->pos().x()), static_cast<float>(event->pos().y()));
io.AddMousePosEvent(MousePos.x, MousePos.y);
}
diff --git i/src/ImGuiRenderer.h w/src/ImGuiRenderer.h
index 6c29f84..4ea6d42 100644
--- i/src/ImGuiRenderer.h
+++ w/src/ImGuiRenderer.h
@@ -1,5 +1,6 @@
#pragma once
+#include <QWindow> // WId
#include <QOpenGLExtraFunctions>
#include <QObject>
#include <QPoint>
diff --git i/src/QtImGui.cpp w/src/QtImGui.cpp
index 5da2c1b..ebb812a 100644
--- i/src/QtImGui.cpp
+++ w/src/QtImGui.cpp
@@ -83,7 +83,7 @@ public:
}
QPointF mapToGlobal(const QPointF& pos) const override {
- return w->mapToGlobal(pos);
+ return w->mapToGlobal(pos.toPoint());
}
WId nativeHandle() const override {
@@ -166,7 +166,7 @@ public:
}
QPointF mapToGlobal(const QPointF& pos) const override {
- return w->mapToGlobal(pos);
+ return w->mapToGlobal(pos.toPoint());
}
WId nativeHandle() const override { |
|
Looks like it doesn't compile on some platforms so I merged it to the separate |
No description provided.