[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdeartwork/kwin-styles/kstep
From:       Luciano Montanaro <mikelima () cirulla ! net>
Date:       2004-07-22 17:13:58
Message-ID: 20040722171358.EC21399FF () office ! kde ! org
[Download RAW message or body]

CVS commit by montanaro: 

Fix bug #84841 (Use the new keepAboveChanged() keepBelowChanged() signals)


  M +18 -13    nextclient.cpp   1.48
  M +3 -2      nextclient.h   1.24


--- kdeartwork/kwin-styles/kstep/nextclient.cpp  #1.47:1.48
@@ -523,5 +523,7 @@ void NextClient::addButtons(QBoxLayout* 
             connect( button[ABOVE_IDX], SIGNAL(clicked()),
                      this, SLOT(aboveClicked()) );
-            keepAboveChange();
+            connect(this, SIGNAL(keepAboveChanged(bool)), 
+                    SLOT(keepAboveChange(bool)));
+            keepAboveChange(keepAbove());
             break;
             
@@ -531,5 +533,7 @@ void NextClient::addButtons(QBoxLayout* 
             connect( button[BELOW_IDX], SIGNAL(clicked()),
                      this, SLOT(belowClicked()) );
-            keepBelowChange();
+            connect(this, SIGNAL(keepBelowChanged(bool)), 
+                    SLOT(keepBelowChange(bool)));
+            keepBelowChange(keepBelow());
             break;
         
@@ -595,8 +599,7 @@ void NextClient::shadeClicked()
 void NextClient::aboveClicked()
 {
-    fprintf(stderr, "aboveClicked called\n");
     setKeepAbove(!keepAbove());
-    keepAboveChange();
-    keepBelowChange();
+    keepAboveChange(true);
+    keepBelowChange(false);
 }
 
@@ -604,6 +607,6 @@ void NextClient::belowClicked()
 {
     setKeepBelow(!keepBelow());
-    keepBelowChange();
-    keepAboveChange();
+    keepBelowChange(true);
+    keepAboveChange(false);
 }
 
@@ -782,21 +785,23 @@ void NextClient::shadeChange()
 }
 
-void NextClient::keepAboveChange()
+void NextClient::keepAboveChange(bool above)
 {
     if (NextButton *b = button[ABOVE_IDX]) {
-        b->setBitmap(keepAbove() ? from_above_bits : keep_above_bits, 10, 10);
+        b->setBitmap(above ? from_above_bits : keep_above_bits, 10, 10);
         QToolTip::remove(b);
-        QToolTip::add(b, keepAbove() ? 
+        QToolTip::add(b, above ? 
                 i18n("Do not keep above others") : i18n("Keep above others"));
+        b->repaint(false);
     }
 }
 
-void NextClient::keepBelowChange()
+void NextClient::keepBelowChange(bool below)
 {
     if (NextButton *b = button[BELOW_IDX]) {
-        b->setBitmap(keepBelow() ? from_below_bits : keep_below_bits, 10, 10);
+        b->setBitmap(below ? from_below_bits : keep_below_bits, 10, 10);
         QToolTip::remove(b);
-        QToolTip::add(b, keepBelow() ? 
+        QToolTip::add(b, below ? 
                 i18n("Do not keep below others") : i18n("Keep below others"));
+        b->repaint(false);
     }
 }

--- kdeartwork/kwin-styles/kstep/nextclient.h  #1.23:1.24
@@ -60,6 +60,4 @@ protected:
     void shadeChange();
     void iconChange();
-    void keepAboveChange();
-    void keepBelowChange();
     QSize minimumSize() const;
     void resize(const QSize &size);
@@ -80,4 +78,7 @@ protected slots:
     void belowClicked();
 
+    void keepAboveChange(bool above);
+    void keepBelowChange(bool below);
+
 private:
     void initializeButtonsAndTitlebar(QBoxLayout* titleLayout);


[prev in list] [next in list] [prev in thread] [next in thread]