mirrors/EQL5
1
Fork 0
mirror of https://gitlab.com/eql/EQL5.git synced 2026-01-21 03:50:42 -08:00
Code Issues Projects Releases Packages Wiki Activity

fix QSELECT/QSEL to work with QQmlApplicationEngine created windows

Browse source
This commit is contained in:
polos 2017-03-19 20:36:14 +01:00
parent f4550494ae
commit e28e2a4af3
3 changed files with 39 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

39
src/lisp/qselect.lisp
View file

@ -31,22 +31,25 @@
(let ((cross-cursor (qnew "QCursor(Qt::CursorShape)" |Qt.CrossCursor|)))
(defun object-selected (object event)
(unless (zerop (qt-object-id object)) ; exclude unknown to EQL
(when *listen*
(setf *listen* nil
*q* object
*qml-stack* nil
*pos* (! "pos" event))
(setf (qt-object-unique object)
(! ("toUInt" ("property" "EQL.unique") *q*)))
(if (find (! "className" (! "metaObject" *q*))
'("LQuickView" "LQuickWidget") :test 'string=)
(indicate*) ; QML items
(indicate)) ; QWidgets
(! "restoreOverrideCursor" "QGuiApplication")
(when *on-selected*
(funcall *on-selected* object))
t))) ; event filter
(when (zerop (qt-object-id object)) ; unknown to EQL, so resort to QObject
(setf (qt-object-id object) #.(qid "QObject")))
(let ((qml (or (! "inherits" object "QQuickWidget")
(! "inherits" object "QQuickWindow"))))
(when (or qml (! "isWidgetType" object))
(when *listen*
(setf *listen* nil
*q* (qt-object-? object)
*qml-stack* nil
*pos* (! "pos" event))
(setf (qt-object-unique object)
(! ("toUInt" ("property" "EQL.unique") *q*)))
(if qml
(indicate*)
(indicate))
(! "restoreOverrideCursor" "QGuiApplication")
(when *on-selected*
(funcall *on-selected* object))
t)))) ; event filter
(defun select-mode ()
(setf *listen* t)
(! "setOverrideCursor" "QGuiApplication" cross-cursor)))
@ -129,7 +132,9 @@
(child child*)))))
(defun indicate* ()
(let ((root (! "rootObject" *q*)))
(let ((root (if (= (qt-object-id *q*) #.(qid "QQuickWindow"))
(! "contentItem"*q*)
(! "rootObject" *q*))))
(indicate-start* *q* (child root))))
(defun indicate-start* (parent child)