From 42fe0f26da22ba708f1d4b08ef93052c5ee4f444 Mon Sep 17 00:00:00 2001 From: coredump Date: Thu, 27 Nov 2003 12:43:02 +0000 Subject: Bugfix: Made sure that the window is always inside the visible area of the display. --- (limited to 'core/applets/screenshotapplet/screenshot.cpp') 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 @@ -493,9 +493,25 @@ 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* ) -- cgit v0.9.0.2