Bugfix: Made sure that the window is always inside the visible area of

        the display.

1 files changed, 19 insertions, 3 deletions

diff --git a/core/applets/screenshotapplet/screenshot.cpp b/core/applets/screenshotapplet/screenshot.cpp
index 2af860a..f2cc2c5 100644
--- a/core/applets/screenshotapplet/screenshot.cpp
+++ b/core/applets/screenshotapplet/screenshot.cpp
@@ -448,59 +448,75 @@ void ScreenshotControl::performGrab()
           }
 
           if ( !pix. isNull ( ))
           {
             const char *ascii = header. latin1 ( );
             uint ascii_len = ::strlen ( ascii );
 
             ::write ( sock, ascii, ascii_len );
 
             QImage img = pix. convertToImage ( ). convertDepth ( 16 );
             ::write ( sock, img. bits ( ), img.numBytes ( ));
 
             ok = true;
           }
         }
         ::close ( sock );
       }
     }
     if ( ok )
       QMessageBox::information ( 0, tr( "Success" ), QString ( "<p>%1</p>" ). arg ( tr( "Screenshot was uploaded to %1" )). arg ( SCAP_hostname ));
     else
       QMessageBox::warning ( 0, tr( "Error" ), QString ( "<p>%1</p>" ). arg ( tr( "Connection to %1 failed." )). arg ( SCAP_hostname ));
   }
 
 }
 
 
 
 //===========================================================================
 
 ScreenshotApplet::ScreenshotApplet( QWidget *parent, const char *name )
     : QWidget( parent, name )
 {
                 setFixedWidth( AppLnk::smallIconSize());
   
     QImage  img = (const char **)snapshot_xpm;
     img = img.smoothScale(AppLnk::smallIconSize(), AppLnk::smallIconSize());
     m_icon.convertFromImage(img);
 }
 
 ScreenshotApplet::~ScreenshotApplet()
 {
 }
 
 void ScreenshotApplet::mousePressEvent( QMouseEvent *)
 {
   ScreenshotControl *sc = new ScreenshotControl ( );
   QPoint curPos = mapToGlobal ( QPoint ( 0, 0 ));
-  sc-> move ( curPos. x ( ) - ( sc-> sizeHint ( ). width ( ) - width ( )) / 2, 
-              curPos. y ( ) - sc-> sizeHint ( ). height ( ));
-  sc-> show ( );
+
+  // windowPosX is the windows position centered above the applets icon.
+  // If the icon is near the edge of the screen, the window would leave the visible area
+  // so we check the position against the screen width and correct the difference if needed
+  
+  int screenWidth = qApp->desktop()->width();
+  int windowPosX = curPos. x ( ) - ( sc-> sizeHint ( ). width ( ) - width ( )) / 2 ;
+  int ZwindowPosX, XwindowPosX;
+  
+  // the window would be placed beyond the screen wich doesn't look tooo good
+  if ( (windowPosX + sc-> sizeHint ( ). width ( )) > screenWidth ) {
+          XwindowPosX = windowPosX + sc-> sizeHint ( ). width ( ) - screenWidth;
+        ZwindowPosX = windowPosX - XwindowPosX - 1;
+  } else {
+          ZwindowPosX = windowPosX;
+  }
+  
+   sc-> move ( ZwindowPosX, curPos. y ( ) - sc-> sizeHint ( ). height ( ) );
+   sc-> show ( );
 }
 
 void ScreenshotApplet::paintEvent( QPaintEvent* )
 {
   QPainter p ( this );
         p.drawPixmap( 0,0, m_icon );
 }