summaryrefslogtreecommitdiff
path: root/core
authorcoredump <coredump>2003-11-27 12:43:02 (UTC)
committer coredump <coredump>2003-11-27 12:43:02 (UTC)
commit42fe0f26da22ba708f1d4b08ef93052c5ee4f444 (patch) (side-by-side diff)
tree70dcac5c2a13b80255fe3f535e4b6f5f9cef5b1c /core
parentd0bf022b91a6b8ae3ffef5438dc924823aacedb9 (diff)
downloadopie-42fe0f26da22ba708f1d4b08ef93052c5ee4f444.zip
opie-42fe0f26da22ba708f1d4b08ef93052c5ee4f444.tar.gz
opie-42fe0f26da22ba708f1d4b08ef93052c5ee4f444.tar.bz2
Bugfix: Made sure that the window is always inside the visible area of
the display.
Diffstat (limited to 'core') (more/less context) (ignore whitespace changes)
-rw-r--r--core/applets/screenshotapplet/screenshot.cpp22
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
@@ -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* )