Large update to the window embedding systems - almost have the compositing up and running.

1 files changed, 2 insertions, 6 deletions

diff --git a/src-qt5/core/libLumina/NativeWindow.cpp b/src-qt5/core/libLumina/NativeWindow.cpp
index 819661d5..ff7322f6 100644
--- a/src-qt5/core/libLumina/NativeWindow.cpp
+++ b/src-qt5/core/libLumina/NativeWindow.cpp
@@ -11,12 +11,10 @@ NativeWindow::NativeWindow(WId id) : QObject(){
   winid = id;
   frameid = 0;
   dmgID = 0;
-  //WIN = QWindow::fromWinId(winid);
 }
 
 NativeWindow::~NativeWindow(){
   hash.clear();
-  //WIN->deleteLater(); //This class only deals with Native windows which were created outside the app - they need to be cleaned up outside the app too
 }
 
 void NativeWindow::addFrameWinID(WId fid){
@@ -43,10 +41,6 @@ unsigned int NativeWindow::damageId(){
   return dmgID;
 }
 
-/*QWindow* NativeWindow::window(){
-  return WIN;
-}*/
-
 QVariant NativeWindow::property(NativeWindow::Property prop){
   if(hash.contains(prop)){ return hash.value(prop); }
   else if(prop == NativeWindow::RelatedWindows){ return QVariant::fromValue(relatedTo); }
@@ -93,9 +87,11 @@ QRect NativeWindow::geometry(){
   QRect geom( hash.value(NativeWindow::GlobalPos).toPoint(), hash.value(NativeWindow::Size).toSize() );
   //Now adjust the window geom by the frame margins
   QList<int> frame = hash.value(NativeWindow::FrameExtents).value< QList<int> >(); //Left,Right,Top,Bottom
+  qDebug() << "Calculate Geometry:" << geom << frame;
   if(frame.length()==4){
     geom = geom.adjusted( -frame[0], -frame[2], frame[1], frame[3] );
   }
+  qDebug() << " - Total:" << geom;
   return geom;
 }
 // ==== PUBLIC SLOTS ===