From 4b90fac0c47a7f00d5d4b147f82c94caa8a60a5e Mon Sep 17 00:00:00 2001
From: arcan1s <darkarcanis@mail.ru>
Date: Fri, 7 Nov 2014 04:56:32 +0300
Subject: [PATCH] implement #28

---
 sources/awesome-widget/reinit.cpp       |  2 +-
 sources/desktop-panel/desktop-panel.cpp | 40 +++++++++++++++++++++----
 sources/desktop-panel/widget.ui         |  6 ++--
 3 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/sources/awesome-widget/reinit.cpp b/sources/awesome-widget/reinit.cpp
index cb93527..85533ef 100644
--- a/sources/awesome-widget/reinit.cpp
+++ b/sources/awesome-widget/reinit.cpp
@@ -131,7 +131,7 @@ void AwesomeWidget::updateTooltip()
     if (tooltipValues.contains(QString("up"))) trueKeys.append(QString("up"));
     if (tooltipValues.contains(QString("bat"))) trueKeys.append(QString("bat"));
     for (int i=0; i<trueKeys.count(); i++) {
-        float normX = 100.0 / (tooltipValues[trueKeys[i]].count() + 0.0);
+        float normX = 100.0 / (float)tooltipValues[trueKeys[i]].count();
         float normY = 100.0 / (1.5 * boundaries[trueKeys[i]]);
         if (trueKeys[i] == QString("bat"))
             isBattery = true;
diff --git a/sources/desktop-panel/desktop-panel.cpp b/sources/desktop-panel/desktop-panel.cpp
index afaa978..25a4804 100644
--- a/sources/desktop-panel/desktop-panel.cpp
+++ b/sources/desktop-panel/desktop-panel.cpp
@@ -129,8 +129,12 @@ DesktopPanel::DesktopWindowsInfo DesktopPanel::getInfoByDesktop(const int num)
 
     QList<WId> windows = KWindowSystem::windows();
     for (int i=0; i<windows.count(); i++) {
-        KWindowInfo winInfo = KWindowSystem::windowInfo(windows[i], NET::Property::WMDesktop | NET::Property::WMGeometry);
-        if (winInfo.isOnDesktop(num)) continue;
+        KWindowInfo winInfo = KWindowSystem::windowInfo(windows[i],
+                                                        NET::Property::WMDesktop | NET::Property::WMGeometry |
+                                                        NET::Property::WMState | NET::Property::WMWindowType);
+        if (winInfo.windowType(NET::WindowTypeMask::NormalMask) != NET::WindowType::Normal) continue;
+        if (winInfo.isMinimized()) continue;
+        if (!winInfo.isOnDesktop(num)) continue;
         info.windows.append(winInfo.geometry());
     }
 
@@ -300,12 +304,36 @@ void DesktopPanel::updateText(const bool first)
 
         // update tooltip
         if (configuration[QString("tooltip")].toInt() == 2) {
-            QPixmap pixmap("/home/arcanis/testicon.jpg");
-            pixmap.scaledToWidth(configuration[QString("tooltipWidth")].toInt());
+            QGraphicsScene *toolTipScene = new QGraphicsScene();
+            toolTipScene->setBackgroundBrush(QBrush(Qt::NoBrush));
+            QGraphicsView *toolTipView = new QGraphicsView(toolTipScene);
+            toolTipView->setStyleSheet(QString("background: transparent"));
+            toolTipView->setContentsMargins(0, 0, 0, 0);
+            toolTipView->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+            toolTipView->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+            // paint
+            DesktopWindowsInfo info = getInfoByDesktop(i + 1);
+            toolTipView->resize(info.desktop.width() * 1.01, info.desktop.height() * 1.03);
+            QPen pen = QPen();
+            pen.setWidthF(2.0 * info.desktop.width() / 400.0);
+            for (int i=0; i<info.windows.count(); i++) {
+                toolTipScene->addLine(info.windows[i].left(), info.windows[i].bottom(),
+                                      info.windows[i].left(), info.windows[i].top(), pen);
+                toolTipScene->addLine(info.windows[i].left(), info.windows[i].top(),
+                                      info.windows[i].right(), info.windows[i].top(), pen);
+                toolTipScene->addLine(info.windows[i].right(), info.windows[i].top(),
+                                      info.windows[i].right(), info.windows[i].bottom(), pen);
+                toolTipScene->addLine(info.windows[i].right(), info.windows[i].bottom(),
+                                      info.windows[i].left(), info.windows[i].bottom(), pen);
+            }
+            // convert
+            QPixmap pixmap = QPixmap::grabWidget(toolTipView);
             QByteArray byteArray;
             QBuffer buffer(&byteArray);
-            pixmap.save(&buffer, "PNG");
-            QString url = QString("<html><img src=\"data:image/png;base64,") + byteArray.toBase64() + QString("\"/></html>");
+            pixmap.scaledToWidth(configuration[QString("tooltipWidth")].toInt()).save(&buffer, "PNG");
+            QString url = QString("<html><style type=\"text/css\">body {margin: 0; padding: 0;}</style><body><img src=\"data:image/png;base64,") +
+                                  byteArray.toBase64() +
+                                  QString("\"/></body></html>");
             labels[i]->setToolTip(url);
         }
     }
diff --git a/sources/desktop-panel/widget.ui b/sources/desktop-panel/widget.ui
index fadfda5..07efabe 100644
--- a/sources/desktop-panel/widget.ui
+++ b/sources/desktop-panel/widget.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>725</width>
-    <height>424</height>
+    <width>723</width>
+    <height>422</height>
    </rect>
   </property>
   <property name="minimumSize">
@@ -442,7 +442,7 @@
        <property name="alignment">
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
        </property>
-       <property name="specialValueText">
+       <property name="suffix">
         <string>px</string>
        </property>
        <property name="minimum">