Added special setActive() and setInactive() functions.

They handle both focus and highlight, which seems logical.

This fixes most annoying bugs with desktop switching.

Signed-off-by: Mavridis Philippe <mavridisf@gmail.com>

src/komposedesktopwidget.cpp

@@ -109,48 +109,53 @@ void KomposeDesktopWidget::initFonts()
 //   return (double)deskRect.width() / (double)deskRect.height();
 // }
 
+void KomposeDesktopWidget::setInactive()
+{
+  if( hasFocus() )
+    clearFocus();
+
+  highlight = false;
+
+  repaint();
+}
+
+void KomposeDesktopWidget::setActive()
+{
+  if( !hasFocus() )
+    setFocus();
+
+  highlight = true;
+  repaint();
+}
 
 void KomposeDesktopWidget::leaveEvent ( TQEvent * )
 {
-  // Unset highlight if cursor moves out of our rect
+  unsetCursor();
+
+  // Mark desktop as inactive if cursor moves out of our rect
   // but not if it enters a child widget
   TQRect deskRect;
   deskRect.setTopLeft(mapToGlobal( TQPoint(0,0) ));
   deskRect.setWidth(width());
   deskRect.setHeight(height());
   if ( !deskRect.contains( TQCursor::pos() ) )
-    highlight = false;
+    setInactive();
-
-  unsetCursor();
-  repaint();
 }
 
 void KomposeDesktopWidget::enterEvent ( TQEvent * )
 {
-  setFocus();
   setCursor( KCursor::handCursor() );
-  highlight = true;
+  setActive();
-  repaint();
 }
 
 void KomposeDesktopWidget::focusInEvent ( TQFocusEvent * )
 {
-  highlight = true;
+  setActive();
-  repaint();
 }
 
 void KomposeDesktopWidget::focusOutEvent ( TQFocusEvent * )
 {
-  // Unset highlight if cursor moves out of our rect
+  setInactive();
-  // but not if it enters a child widget
-  TQRect deskRect;
-  deskRect.setTopLeft(mapToGlobal( TQPoint(0,0) ));
-  deskRect.setWidth(width());
-  deskRect.setHeight(height());
-  if ( !deskRect.contains( TQCursor::pos() ) )
-    highlight = false;
-
-  repaint();
 }
 
 void KomposeDesktopWidget::mouseReleaseEvent ( TQMouseEvent * e )

src/komposedesktopwidget.h

@@ -36,6 +36,9 @@ public:
 
   ~KomposeDesktopWidget();
 
+  void setInactive();
+  void setActive();
+
   //   int getHeightForWidth( int w ) const;
   //   int getWidthForHeight( int h ) const;
   //   double getAspectRatio();