Merge branch 'main' of https://github.com/NDRAEY/DesktopZephyr

NDRAEY · Mar 22, 2024 · d2c2e23 · d2c2e23
2 parents 37ade12 + 53cacd4
commit d2c2e23
Show file tree

Hide file tree

Showing 5 changed files with 131 additions and 19 deletions.
diff --git a/.idea/editor.xml b/.idea/editor.xml
diff --git a/include/Zephyr.hpp b/include/Zephyr.hpp
@@ -33,8 +33,8 @@ class Zephyr : public QWidget {
     void showBubble(const QString& text, qsizetype duration);
     void showContextMenu(const QPoint &pos);
 
-    void enableMouseTracking();
-    void disableMouseTracking();
+    void enableMouseTracking() const;
+    void disableMouseTracking() const;
 
     void lookLeft();
     void lookRight();

diff --git a/src/Main.cpp b/src/Main.cpp
@@ -56,7 +56,7 @@ int main(int argc, char* argv[]) {
     });
     introtimer.start(50);
 
-    QTimer::singleShot(5000, &test, [&]() {
+    QTimer::singleShot(5000, &test, [&] {
         introtimer.stop();
 
         test.stopAnimation();
@@ -74,9 +74,16 @@ int main(int argc, char* argv[]) {
         test.showBubble("ZE... RA? ZERA-ORA!", 3000);
     });
 
-    QTimer::singleShot(8000, &test, [&]() {
+    QTimer::singleShot(8000, &test, [&] {
         test.enableMouseTracking();
     });
+    //
+    // auto winlist = PlatformSpecific::X11::GetWindowList();
+    //
+    // foreach(const auto& i, winlist) {
+    //     qDebug() << i;
+    // }
+
 
     int code = app.exec();
 

diff --git a/src/X11/WindowList.cpp b/src/X11/WindowList.cpp
@@ -47,9 +47,11 @@ QList<std::pair<QString, QPoint>> PlatformSpecific::X11::GetWindowList() {
             XFree(windowName);
         }
 
-        list.push_back({
-            name, {x, y}
-        });
+        if(!name.isEmpty()) {
+            list.push_back({
+                name, {x, y}
+            });
+        }
     }
 
     XFree(children);

diff --git a/src/Zephyr.cpp b/src/Zephyr.cpp
@@ -163,28 +163,28 @@ void Zephyr::showBubble(const QString& text, qsizetype duration) {
     move({after_coords.x(), after_coords.y() - bubble_height});
 
     QTimer::singleShot(duration, this, [&](){
-        auto after_coords = geometry();
-        auto bubble_height = bubble->height();
+        auto coords = geometry();
+        auto after_bubble_height = bubble->height();
 
         bubble->hide();
 
-        auto cur_size = size();
-        cur_size.setHeight(cur_size.height() - bubble_height);
-        setFixedSize(cur_size);
+        auto sz = size();
+        sz.setHeight(sz.height() - after_bubble_height);
+        setFixedSize(sz);
 
-        move({after_coords.x(), after_coords.y() + bubble_height});
+        move({coords.x(), coords.y() + after_bubble_height});
     });
 }
 
 void Zephyr::showContextMenu(const QPoint &pos) {
     QMenu contextMenu(tr("Context menu"), this);
 
-    contextMenu.addAction(tr("About"), this, [&](){
+    contextMenu.addAction(tr("About"), this, [&] {
         auto* window = new AboutWindow();
         window->show();
     });
 
-    contextMenu.addAction(tr("Exit"), this, [&](){
+    contextMenu.addAction(tr("Exit"), this, [&]{
         QApplication::quit();
     });
 
@@ -196,7 +196,7 @@ void Zephyr::lookLeft() {
         return;
     }
 
-    for(auto animation : animations) {
+    for(const auto animation : animations) {
         animation->mirror(true, false);
     }
 
@@ -208,18 +208,18 @@ void Zephyr::lookRight() {
         return;
     }
 
-    for(auto animation : animations) {
+    for(const auto animation : animations) {
         animation->mirror(true, false);
     }
 
     looking_direction = true;
 }
 
-void Zephyr::enableMouseTracking() {
+void Zephyr::enableMouseTracking() const {
     mouse_tracker_thread->start();
 }
 
-void Zephyr::disableMouseTracking() {
+void Zephyr::disableMouseTracking() const {
     mouse_tracker_thread->quit();
 }