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
@@ -368,139 +368,155 @@ void ScreenshotControl::savePixmap()
       qDebug("Writing doclink did not work");
   }
   else {
 
     fileName = "sc_" + QDateTime::currentDateTime().toString();
     fileName.replace(QRegExp("'"), "");
     fileName.replace(QRegExp(" "), "_");
     fileName.replace(QRegExp(":"), ".");
     fileName.replace(QRegExp(","), "");
     QString dirName = QDir::homeDirPath() + "/Documents/image/png/";
 
     if ( !QDir( dirName).exists() ) {
       qDebug("making dir " + dirName);
       QString msg = "mkdir -p " + dirName;
       system(msg.latin1());
     }
     fileName = dirName + fileName;
     if (fileName.right(3) != "png")
       fileName = fileName + ".png";
     lnk.setFile(fileName); //sets File property
     qDebug("saving file " + fileName);
     snapshot.save( fileName, "PNG");
     QFileInfo fi( fileName);
     lnk.setName( fi.fileName()); //sets file name
 
     if (!lnk.writeLink())
       qDebug("Writing doclink did not work");
 
   }
 
   QPEApplication::beep();
 }
 
 void ScreenshotControl::performGrab()
 {
   snapshot = QPixmap::grabWindow( QPEApplication::desktop()->winId(), 0, 0, QApplication::desktop()->width(), QApplication::desktop()->height() );
 
   if (buttonPushed == 1) {
     qDebug("grabbing screen");
     grabTimer->stop();
     show();
     qApp->processEvents();
     savePixmap();
   }
   else {
     grabTimer->stop();
 
     struct sockaddr_in raddr;
     struct hostent *rhost_info;
     int sock = -1;
     bool ok = false;
 
     if (( rhost_info = (struct hostent *) ::gethostbyname ((char *) SCAP_hostname )) != 0 ) {
       ::memset ( &raddr, 0, sizeof (struct sockaddr_in));
       ::memcpy ( &raddr. sin_addr, rhost_info-> h_addr, rhost_info-> h_length );
       raddr. sin_family = rhost_info-> h_addrtype;
       raddr. sin_port = htons ( SCAP_port );
 
       if (( sock = ::socket ( AF_INET, SOCK_STREAM, 0 )) >= 0 )
       {
         if ( ::connect ( sock, (struct sockaddr *) & raddr, sizeof (struct sockaddr)) >= 0 ) {
           QString header;
 
           header = "POST /scap/capture.cgi?%1+%2 HTTP/1.1\n"  // 1: model / 2: user
                    "Content-length: 153600\n"
                    "Content-Type: image/gif\n"
                    "Host: %4\n"                               // 3: scap host
                    "\n";
 
           header = header. arg ( "" ). arg ( ::getenv ( "USER" )). arg ( SCAP_hostname );
 
           QPixmap pix;
 
           if ( snapshot. width ( ) == 320 && snapshot. height ( ) == 240 )
           {
             pix = snapshot;
           }
           else if ( snapshot. width ( ) == 240 && snapshot. height ( ) == 320 )
           {
             pix = snapshot. xForm ( QWMatrix ( ). rotate ( 90 ));
           }
 
           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 );
 }